Added functionality for cancelling a pomodoro and improved use of require.js in the automated test side
Merge branch 'master' into gh-pages
published later version with support for cancelling pomodoros.