problem with line endings while commiting
fixing merging
Merge branch 'master' of https://github.com/sunpy/sunpy
Merge branch 'master' of github.com:sunpy/sunpy into masterorigin
Merge branch 'master' of https://github.com/sunpy/sunpy into masterorigin
Merge remote-tracking branch 'upstream/master' into masterorigin
big refactoring of installation instructions
just a test
Fixed transparency on logo pngs
fixes to troubleshooting guide
update to doc string for solar constants.
Minor changes to map docstring.
implemented a calculation for sun-earth distance for SXT
Merge remote-tracking branch 'upstream/master'
updates to dev guide
cleaning up GOES code; GOES now returns data when presented with a single argument that is a TimeRange object.  Passing comma separated times (in any format) as arguments to the function does not work at present.
Merge remote-tracking branch 'upstream/master'
Standardised spectrum plotting, plot() now acts like plt.plot() and there is a peek() function.
update to git instructions
Merge pull request #349 from ehsteve/staging

Staging updates