Oldcommits

um... so I had some local commits in Bokeh
as well as some commits I just pushed from CDX from when we were cramming for darpa....

I don't want to just merge them in, but I'm storing them here for now until we can review...