Some PEP8 fixes pulled from another PR to ease merging
Some PEP8 fixes pulled from another PR to ease merging

dpshelio/sunpy,dpshelio/sunpy,Alex-Ian-Hamilton/sunpy,dpshelio/sunpy,Alex-Ian-Hamilton/sunpy,Alex-Ian-Hamilton/sunpy