Merge pull request #831 from derdon/mapcube

"fixed" MapCube.coalign
Merge pull request #830 from derdon/rhessi

fixed NameError in instr.rhessi.get_obssumm_file
Merge pull request #829 from derdon/map-trace

added missing import for TRACEMap implementation
Merge pull request #828 from derdon/hinode-fix

fixed XRTMap.__init__
Merge pull request #752 from derdon/dbtest-travis

fixed tests which causes trouble on travis
Merge pull request #836 from derdon/dbtest-travis

travis tests (to 0.4)
Add a Windows warning to io/ana.py
Merge pull request #835 from Cadair/docs_04

Docs 04
Merge pull request #839 from sunpy/master

merge master into 0.4
Merge pull request #837 from wafels/0.4-doc-change-3

adding in GSOC acknowledgement to the documentation
Merge pull request #840 from sunpy/master

merge master into 0.4 2
Update setup.py
Merge pull request #838 from Cadair/0.4

This is 0.4
small rhessi refactor. use a for-loop to obey DRY.
Added method Database.add_from_hek_query_result
Merge remote-tracking branch 'upstream/master' into noaa
re-ordered import list
Add window method and tests to TimeRange object
Merge pull request #801 from VaticanCameos/derdonNIError

Implemented derdon's request for NotImplementedError.
Merge pull request #759 from Cadair/timerange

Add a window method to TimeRange