first pass at fixing objects ref problem
fix small demo errors
fix #240
Merge branch 'master' of github.com:ContinuumIO/bokeh