Merge pull request #15 from keflavich/template-rebase

Template rebase - I guess that looks fine
added astropy's .travis.yml verbatim.
added astropy 0.2rc1 in .travis