Merge branch 'namespace_cleanup' of https://github.com/rhewett/sunpy
local testing
Add stereo cor colour maps from IDL. Not tested yet.
Tested COR1 and COR2
Merge remote-tracking branch 'upstream/master' into staging
Fixes issue #416: Helioviwer tests should not break on server error.
Merge pull request #422 from sunpy/master

staging / master sync
Merge branch 'master' of https://github.com/sunpy/sunpy
Merge remote-tracking branch 'upstream/staging'
Small test fix
more test fixes; removed lightcurve plotting
Merge branch 'staging' of https://github.com/Cadair/sunpy into staging
travis WHYYY
Merge pull request #418 from Cadair/staging

Add Stereo COR colour maps
Travis pyfits version
Travis
Superfluous lightcurve tests
now pandas s broken
ahhhh Travis WHy
Travis: re-order dep install