Merge branch 'master' of https://github.com/sunpy/sunpy into coordinates-framework

Conflicts:
	.travis.yml