Removed some temp code for testing.
Merge branch 'handlebar' of github.com:scrollback/scrollback into handlebar