Astropy tables

This PR rebases #150 onto the staging branch, and cleans up some final dangling atpy references.

@astrofrog, unless you see any issues, this should be ready to merge (can you try running the tests to be sure?)