Merge pull request #411 from sunpy/staging

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

Update staging again.
Merge branch 'master' of https://github.com/sunpy/sunpy
made the default option for passing in of multiple maps a MapCube
Merge branch 'staging' of https://github.com/sunpy/sunpy
added in placeholders for different types of derotation and co-aligment
more edits to mapcube