Merge pull request #411 from sunpy/staging

Update Staging into Master
Merge pull request #412 from sunpy/master

Update staging again.