updated travis config to make 3 attempts before calling it a time out
updated travis config to make 3 attempts before calling it a time out.
This fixes #69
Merge branch 'devin/issues/69' of github.com:dhoss/Kodiak into devin/issues/69
updated kodiak_rspec script to run bundle install before tests are run. this fixes #71
Merge branch 'master' into devin/issues/60
initial user abilities tests
added role and user_role models
updated ability model with basic roles and added users_roles/roles relationship to user model
added user_role migration
added tests for adding and checking user roles
initial acls work
stubbed out admin tests for roles
committing upstream