Merge branch 'master' of https://github.com/sunpy/sunpy into goes_analysis
Merge branch 'master' of https://github.com/sunpy/sunpy into goes_analysis
Merge branch 'goes_analysis' of https://github.com/DanRyanIrish/sunpy into goes_analysis
Added additional checks in test_goes.py to make sure (hopefully all)
correct Errors are raised when incorrected inputs are entered.