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
modified setup.py to make shining pandas work,  and build from other
directories.
Attempt ot fix shining pandas by mofifying the c extension code.
undo last.
added setup location to include dirs.
more setup.py testing for shining pandas.
Update sunpy/lightcurve/sources/lyra.py

changed show() to peek()
and agin.
Removed build c ext from setup.py to all use of shining panas for testing 0.2
-- must be put back before release!"
Merge branch 'staging' of github.com:sunpy/sunpy into staging
Modifed author list, and reinstated C build.
Merge branch 'staging' of https://github.com/sunpy/sunpy into staging
Merge remote-tracking branch 'upstream/master'
Fix setup.