added commented-out edit_on_github section to conf.py and related instructions in README
line wrap fixes
Fix scripts/README.rst bug
Merge pull request #13 from weaverba137/fix-setup

Fix scripts/README.rst bug
Merge pull request #8 from eteq/add-edit-on-github

Adds edit_on_github extension
Add .travis.yml file
Add instructions for travis-ci to README
Merge pull request #20 from cdeil/travis

Add .travis.yml file to package-template
_PACKAGE_SETUP_ should be _ASTROPY_SETUP_ (see astropy/astropy#950)
Merge pull request #21 from astrofrog/fix-python3-failure

_PACKAGE_SETUP_ should be _ASTROPY_SETUP_
Test with different Numpy versions, only test Sphinx with Python 2.7.
Merge pull request #22 from astrofrog/improve-travis-config

Test with different Numpy versions, only test Sphinx with Python 2.7.
Ensure that optional dependencies for Sphinx are installed
More Python 3 fixes
Added back MySQL and PostGreSQL tests
Merge remote branch 'template/master' into astropy-affiliated

Conflicts:
	README.rst
Added database setup to .travis.yml
Added optional dependencies to .travis.yml