Updated to work with the new toolbar.
Merge branch 'master' of https://github.com/campd/scratchpad-gist into dcamp-master

Conflicts:
	bootstrap.js
Merge pull request #1 from robcee/master

Updated to work with the new toolbar.