security changes to allow templating
Merge branch 'master' of https://github.com/katjwinter/ChromeNotes
Refactoring complete. Tested. Needs style.