Travis tweak
Merge branch 'staging' of github.com:sunpy/sunpy into staging
Updated distribute_setup.py to version 0.6.45
Merge pull request #476 from ayshih/distribute

Updated distribute_setup.py
Merge branch 'staging' of github.com:sunpy/sunpy into staging
Documentation and error correcting the registration factory base
Default is a more sensible variable name than generic
Documented the Map factory
Updated the guide for the Map Refactor
Added documentation for Map construction and for registering with the Map factory
io tests
Merge branch 'map_refactor' of github.com:Cadair/sunpy into map_refactor
Patch map_factory
more io tests
Force deps pyfits>3 and numpy>1.6
fixes
should pass TravisCI, disabled jp2 tests till work around can be found
Merge pull request #482 from Cadair/map_refactor

The MAP REFACTOR is here!
Merge remote-tracking branch 'upstream/staging' into pyfits

Conflicts:
	.travis.yml
	setup.py