Changed 'type' parameter to 'marker' in scatter examples.
fix #276
fix #277
fix zoom tool imports
 removed old file,  instead refer to http://localhost:5006/bokeh/generate_embed/direct and the generate_embed tests
Merge branch 'master' into session-improvements