Update models to protect ids and fix tests to match
Update Shifts to not require orgs
Updated seeds (use rake db:reset from now on)
Merge branch 'Seeds' of https://github.com/minigeek/boa-1 into minigeek-Seeds
readded a test
Fixes for testing and setup of the gemfile