Merge branch 'differential_rotation' into diff_rot_image

Conflicts:
	sunpy/map/mapbase.py
	sunpy/map/mapcube.py