Update the changelog with all the 0.2.1 changes that have thus far been merged into the 0.2.x branch.
Merge branch 'master' of github.com:astropy/astropy