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
Merge pull request #366 from sunpy/0.2

Merging staging into master
Update README.md

placed show with peek
Update doc version to 0.2
Merge pull request #368 from sunpy/0.2

0.2
Merge remote-tracking branch 'upstream/master'
Merge pull request #369 from Cadair/staging

Staging
Test for 3.x.
Update doc/source/guide/helioviewer.rst

Updated to make a note of the need to install OpenJPEG.
Update doc/source/guide/helioviewer.rst
Previously, the helioviewer client required PIL to be installed since OpenJPEG did not write PNG files, and matplotlib only read PNG natively (requiring an intermediate format).  OpenJPEG v2.0 now writes PNG, so PIL is no longer required for Helioviewer client.  Further, the hv client returned upside out images when reading a local jp2 file; this has been fixed too.
Update doc/source/guide/helioviewer.rst
fixed helioviewer to use opj_decompress instead of j2k_to_image
Update sunpy/__init__.py
Merge branch 'master' of https://github.com/sunpy/sunpy