fix broken axis()/xaxis()/yaxis()
remove 'default' field from python side
DataSpec.to_dict() should return {} in the default case
Merge remote-tracking branch 'origin/master' into task/remove_default

Conflicts:
	bokeh/plotting.py
merge
Merge branch 'task/remove_default' of github.com:ContinuumIO/bokeh into task/remove_default
add jnslog to bokehjs sources
enabled BokehJS logging level to be cofigurable from python
update log level to work with autoload plots too
update resources tests
try logging fix for dev mode
merge master
Don't repeat Include properties' prefix
Disable redis(-py) dependency on windows (#940)
Remove gmaps from server/templates/_page_base.html (#936)
Don't fail but warn when can't connect to S3

Previously it made impossible to run tests when PR was
initiated from a fork.
DRY by using get_version_from_git()
Transform version-number-gSHA1 to version-SHA1

Then 'number' part varies depending on how the repository
was cloned, giving different results for local clones and
on travis-ci.
Merge pull request #1066 from ContinuumIO/mattpap/conda-windows

Disable redis(-py) dependency on windows (#940)
Merge pull request #1067 from ContinuumIO/mattpap/remove_gmaps

Remove gmaps from server/templates/_page_base.html (#936)