timer consistency
Merge branch 'master' of github.com:tobobo/thyme

Conflicts:
	app/controllers/timers.coffee
	app/routes.coffee