added nodemailer to package.json - fix #1586
Update settings.json.template
Update settings.json.template
Merge branch 'release/1.2.81'
fix tests in firefox as firefox fires on keypress not down
This isn't ideal, basically some browsers interact with keypress/keydown in different ways so this is a workaround but it's not perma
missed an evt
 now IE friendly
this should pass more tests..
fix undo test
Merge pull request #1616 from ether/ff-key-tests

fix tests in firefox as firefox fires on keypress not down
escape .color
Merge pull request #1617 from ether/replace-html-with-text

escape .color
remove pointless +
specialkey doesnt even exist afaik
return text instead of html
Merge pull request #1618 from ether/tidy-up

Tidy up
Fix clearing authorship colors which was broken by #1609

Fixes #1620
Merge pull request #1622 from ether/fix/submitting-submitting-faked-changesets

Fix clearing authorship colors which was broken by #1609
release v1.2.9