Bleh, remove tabs
Use B&W mapnik maps

These maps have more detail than stamen maps, but without the
distracting colours of the normal mapnik tiles.
Merge remote-tracking branch 'upstream/master'