merge with segfaulthunter/axis
merge with segfaulthunter/axis

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