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
just a test
implemented a calculation for sun-earth distance for SXT
Merge remote-tracking branch 'upstream/master'
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.
Standardised spectrum plotting, plot() now acts like plt.plot() and there is a peek() function.
Merge pull request #349 from ehsteve/staging

Staging updates
Fixed plot() and peek() so that their behavior is consistent with map and with matplotlib
Merge branch 'staging' of https://github.com/sunpy/sunpy
No subplot call, uses gca() in plot() instead.
figure.show()
made peek() consistent with spectrum
Bring map inline with lightcuve and spectrum
removed '>>>' from lightcurve docstrings
Merge pull request #352 from rhewett/master

fixed lightcurve plotting per issue #258