Update from package template

This updates astroquery to the latest template code - it does mean installation will be broken with anything but the latest developer version of Astropy, but this will be necessary to be 0.2-compatible.

I need to understand why there are so many commits though - maybe we'd never merged 'properly' before.