Merge branch 'pr/9'

* pr/9:
Clean up a bit
Crack the bugs

Conflicts:
package.json
routes_calendar.coffee