Removes tokens_controller from cucumber tests
Merge branch 'master' of github.com:dwroth/TeaTracker