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
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
Class splitting
Merge branch 'master' of github.com:sunpy/sunpy
Added basic factory for map and set up the list of potential loading patterns for the argument string.
Added factory base to util and fixed a spacing issue
Sketched out read_file function
Made it so existing maps were not forgotten to be returned.
Import tweaks and goodbye make_map
Cleaned up some goofy spacing.  Removed unnecessary extra class and made
it so Map will actually call.
Merge pull request #1 from rhewett/map_refactor

Map runs now.
small tweaks now processes args
Changes to RegisteredFactoryBase