Patch from Andrew Hood: https://groups.google.com/forum/#!topic/astrometry/Dt-3V2v4fyo
pass-through another NanColormap property
Merge branch 'master' of github.com:dstndstn/astrometry.net

Conflicts:
	util/plotutils.py