Preliminary type-driven JSON deserialization
Fix name errors in Dict.from_json()
Merge remote-tracking branch 'origin/master' into mattpap/deserialization

Conflicts:
	bokeh/objects.py
Merge pull request #1312 from bokeh/mattpap/deserialization

Preliminary type-driven JSON deserialization