Clean up.
Use a configuration for managing the toolbar.
Merge branch 'master' of https://github.com/substance/tahi-editor

Conflicts:
	index.html
	js/router.js