Merge remote-tracking branch 'template/master' into update-from-template

Conflicts:
	README.rst
	conftest.py
	distribute_setup.py
	docs/conf.py
	packagename/__init__.py
	packagename/conftest.py
	setup.py
	specutils/conftest.py