restore templates to files
Merge branch 'session_refactor' of github.com:ContinuumIO/bokeh into session_refactor
some cleanup and docs