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 branch 'master' of https://github.com/sunpy/sunpy
Merge branch 'master' of github.com:sunpy/sunpy into masterorigin
Merge branch 'staging' of https://github.com/sunpy/sunpy
fixed jp2 reading for the case where the FITS header does not have a COMMENT keyword.  At time of writing, this applies to SWAP data.
parse_time will propagate down into lists of lists
parse_time will propagate down into nested tuples
Bugfix: added the possibility of long input for seconds past 1979
Revised checking for tuples that are intended as datetime input
Merge pull request #373 from wafels/master

Fix for reading JP2 files
Merge pull request #375 from ayshih/parse_time

Adding functionality to parse_time
Update doc/source/guide/troubleshooting.rst

removed PIL
Update setup.py

removed PIL
Update sunpy/util/__init__.py

removed PIL
Removed NoneType import (Python 3 compat)