Commit.
merge in defaults/display_defaults changes
use functions for defaults/display_defaults
Merge branch 'build-staging' of github.com:ContinuumIO/bokehjs into build-staging