error on log in if user has not been logged in via web interface, see #237
Merge branch 'master' of https://github.com/travis-ci/travis.rb