Author modification
Merge branch 'diff_rot' of https://github.com/Cadair/sunpy into diff_rot

Conflicts:
	sunpy/coords/util.py