deleting bokeh.html before M force pushes a commit.
oops, didn't meant to delete it locally.
getting on the same page
Merge branch 'master' of https://github.com/dotsara/wreck-it
Made some changes, trying to push over rolled back commits.

So: we got on the same page, then M rolled back a few commits, while
locally I made some changes, now I'm going to try to push this commit
to see what happens. (We are hoping this will be messy and scary.)
ZZZZZZZZ