Made some formatting changes suggested by pylint
Merge branch 'goes_analysis' of https://github.com/DanRyanIrish/sunpy into goes_analysis

Conflicts:
	sunpy/instr/goes.py
Altered one of the error messages slightly in _check_download_file().