Merge pull request #87 from embray/issue-87

version.py does not hard-code githash for releases
Conflicts:
	CHANGES.rst
Merge pull request #88 from bsipocz/sphinx_smart_resolve_bases

Sphinx smart resolve Bases from intersphinx for affiliated packages
Merge pull request #89 from embray/issue-89

Development mode install from clean source fails on first attempt
Merge pull request #98 from embray/issue-98

Bootstrap failures with Python 2
Merge pull request #57 from astrofrog/use-conda

Switch .travis.yml to use conda
Conflicts:
	.travis.yml
Merge pull request #78 from migueldvb/six

Use six.iteritems for compatibility with python 3
Merge pull request #96 from astrofrog/fix-six

Remove dependency on six and enable sphinx tests on Python 3
Conflicts:
	CHANGES.rst
Added status badges