Merge pull request #1203 from Cadair/0.5

0.5.2
Try and fix HEK numbers
Merge branch '0.5' of github.com:Cadair/sunpy into 0.5

Conflicts:
	sunpy/database/tests/test_database.py
Merge branch '0.5' of git://github.com/sunpy/sunpy into 0.5