Merge pull request #24 from OliverJAsh/master

Add the Events stuff back in
Passed app.init directly as argument

Instead of the anonymous function
Merge pull request #33 from boye/master

Minor improvement in main.js