Fixing candlestick demo (again) to use computed data width
Merge branch 'master' of github.com:ContinuumIO/Bokeh

Conflicts:
	examples/plotting/file/candlestick.py
Adding x_axis_type and y_axis_type to support DatetimeAxis; updating candlestick demo to use rotated datetime axis
Merge branch 'master' of github.com:ContinuumIO/Bokeh