Merge branch 'master' into sbt

Conflicts:
	.gitignore
Add information about sbt to dev_guide.rst
fix #570
Merge branch 'master' of github.com:ContinuumIO/bokeh
Merge pull request #483 from mattpap/sbt

Experimental bokehjs build system using sbt (scala)
Merge branch 'master' into widgets1