Merge branch 'jsoc_improvements' of github.com:Cadair/sunpy into jsoc_improvements