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 diff_rot