undoing javascript changes and re-adding messages
Merge branch 'master' of https://github.com/rememberaaronswartz/rememberaaronsw