Fix minor syntax error
Merge branch 'master' of github.com:chronophasiac/timevault

Conflicts:
	spec/models/interval_spec.rb
Add dependent destroy to pomodoro-interval association