Merge branch 'staging'

Conflicts:
	.travis.yml
Docs.
Docs.
Update docs
Merge pull request #453 from sunpy/master

Pull stuff from master back to staging