updated CHANGELOG
updated CHANGELOG

bretthandrews/marvin,sdss/marvin,albireox/marvin,sdss/marvin,albireox/marvin,bretthandrews/marvin,sdss/marvin,bretthandrews/marvin,sdss/marvin,albireox/marvin,bretthandrews/marvin,albireox/marvin