Use MiniConda for affiliated packages
Make sure conda’s astropy is removed before pip installing the latest developer version
Added more comments to .travis.yml
Pin Numpy version
Don’t use --parallel with Python 3
Update astropy_helpers
More tidying up of .travis.yml file
Merge pull request #79 from astrofrog/use-miniconda-for-travis

First attempt at using MiniConda for affiliated packages
Merge remote-tracking branch 'template/master' into update-from-template-june-2014

Conflicts:
	.travis.yml
	MANIFEST.in
	README.rst
	docs/packagename/index.rst
	packagename/tests/test_example.py
	setup.cfg