amreenshaikh/bokeh — pull request #2 by amreenshaikh (2014-04-28 11:05:36+00:00)
Title: Merge with master

To avoid conflicts in future