Synced with upstream
Merge branch 'master' of github.com:sunpy/sunpy
Merge branch 'master' of github.com:sunpy/sunpy
Merge branch 'staging' of github.com:sunpy/sunpy
Update sunpy/__init__.py

updated version number
Merge branch 'master' of github.com:sunpy/sunpy
Fixes issue #416: Helioviwer tests should not break on server error.
add print statement to let people know when helioviewer tests are skipped
First step of refactoring map.

Subtraction and operator overloading in general needs attention.
Does * / + - make any sence on a map? or should they only be allowed on
map.data?
no operators
The first MapBase / GenericMap split
Minor fixes
Additional tests for sunpy.map.map
Minor fix
Added tests for rotate()
Class splitting
More tests taking scaling into account
Merge pull request #421 from khughitt/master

Prevent Helioviewer unit tests from failing when server is inaccessible
Merge pull request #438 from ankit-maverick/minor_fixes

Minor fixes
TimeRange updated to accept TimeRange objects.