Merge branch 'master' of github.com:ContinuumIO/Bokeh

Conflicts:
	jsbuild/application.js
	jsbuild/bokehnotebook.js
	subtree/bokehjs/demo/coffee/candle.coffee
	subtree/bokehjs/static/coffee/base.coffee
	subtree/bokehjs/static/coffee/renderers/guides.coffee
Merge branch 'master' of github.com:ContinuumIO/Bokeh
axes with user bounds should re-tick as necessary when zoomed in and out or panned