working on guide for choosing colormaps. Have overview section and start on a few others.
added colormaps guide to beginner guide
some more text to colormaps
added a bunch of stuff to my colormap info
finished up draft
Fix MatplotlibDeprecationWarning: The "loc" positional argument to legend is deprecated
BUG: fix test error when ghostscript not installed

Confusingly checkdep_ghostscript returns a tuple rather than a bool, so
we need to check an element of the tuple to see whether ghostscript is
installed.  Put the test into a decorator in case we need it for another
test.
Merge pull request #3312 from matthew-brett/fix-ghostscript-skip

BUG: fix test error when ghostscript not installed
Merge pull request #3310 from cgohlke/patch-6

Fix MatplotlibDeprecationWarning: The "loc" positional argument to legend is deprecated
TST: Fix test_animation RuntimeErrors on Windows
Merge pull request #3317 from cgohlke/patch-1

TST: Fix test_animation RuntimeErrors on Windows

This does not require another RC
now with scripts actually included!
DOC: Fix Malformed table. Text in column margin
Merge pull request #3320 from cgohlke/patch-2

DOC: Fix Malformed table. Text in column margin

only doc white-space changes
Merge pull request #3301 from kthyng/new_colormaps


DOC : added colormap information

Colormap choice guidelines in documentation - based on talk at SciPy 2014

Only changes to rst + examples scripts.
ENH: add HTML Help builder option
Build gallery also for HTML Help docs
Merge pull request #3323 from MrLeeh/patch-2

BUG : fixes py3k unicode issues

Replaced unicode() function by six.text_type
Workaround for Sphinx not escaping ``_`` (underscore) for tex output
Merge pull request #3329 from lennart0901/fix_#3326

Workaround for Sphinx not escaping ``_`` (underscore) for tex output