separate out the request for the z-coordinate from the calculation of the z-coordinate (found by Laura Hayes)
put the ability to pass in a z-corinate back into convert_hg_hcc, returning the 0.2 functionality
Changed the norm() method of GenericMap to an attribute.

This allows the user to overwrite it and customise it.
I have also changed the keyword parseing in MapCube.plot()
so that all kwargs are passed to imshow and kwargs to
mpl.animation.FuncAnimate can be passed in a dict in the ani_kwagrs
kwarg.
Merge branch '0.3_norm' into norm_fix
more comments on the code changes
added in another example of the conversion
amended example
Added support for IRIS timeline date formats
Merge pull request #598 from tiagopereira/master

Added support for IRIS timeline date formats
re-add fortran complier and make scipy compile from source as a test
Helioviewer test fail fix
Add back scipy wheel flag
Merge pull request #601 from Cadair/travis_patch

re-add fortran complier and make scipy compile from source as a test
Change the base URL for EVE data
Merge branch 'travis_patch' into goes_fail
change limb plotting default
Merge pull request #602 from Cadair/goes_fail

Test Fixes
Merge pull request #604 from Cadair/issue_424

change limb plotting default
Merge remote-tracking branch 'upstream/master' into norm_fix

Conflicts:
	sunpy/map/mapbase.py
Merge pull request #605 from wafels/wcs

WCS pull request to master