Maintain legends' order (use List instead of Dict) (#926)
Merge remote-tracking branch 'origin/master' into mattpap/926_ordered_legends

Conflicts:
	bokehjs/src/coffee/renderer/annotation/legend.coffee
	examples/embed/app_reveal.py
	examples/embed/widget.py
	examples/glyphs/taylor_server.ipynb
Merge remote-tracking branch 'origin/master' into mattpap/926_ordered_legends

Conflicts:
	bokeh/objects.py
Convert OrderedDict back to List(Tuple) in _glyph_function
Fix legend construction in glyphs/population_server
Python 3 compatibility in bokeh.charts._charts
Merge remote-tracking branch 'origin/master' into mattpap/926_ordered_legends

Conflicts:
	bokeh/_glyph_functions.py
	bokeh/objects.py
Add missing Tuple import to models.renderers
Remove files that slipped in 2c31e8a merge
Merge remote-tracking branch 'origin/master' into mattpap/926_ordered_legends
Add OrElse property to handle alternative types with conversions
Merge pull request #1232 from bokeh/mattpap/926_ordered_legends

Maintain legends' order (use List instead of Dict) (#926)
update hover too to match glyphspec refactor
Merge pull request #1341 from bokeh/bugfix/1300

update hover too to match glyphspec refactor