ENH: Black and white plots.
capitalize figure
bring in changes from bw
PAPER: Typos and rewrites.
Merge branch 'master' into bw
PAPER: Update post-merge.

Worked well, didn't have to change all the picture paths.