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 github.com:sunpy/sunpy into masterorigin
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)
Merge pull request #381 from khughitt/master

Python 3.x fix (removed NoneType import)
Moved the chaincode files from the other branch to ROI directory
added __init__.py so chaincode can be imported
Cleand the code following PEP8, and added a new function to chaincode
Merge pull request #379 from wafels/master

PIL removed
Merge pull request #386 from dpshelio/roi

First tool for the Region of Interest (ROI) module in Sunpy
Merge pull request #384 from Cadair/staging

Adding Composite Map draw_limb and draw_grid.
Merge pull request #395 from sunpy/staging

Merge Staging to Master
Merge remote-tracking branch 'upstream/master' into cube_ani