merged in Mike Big changes with Dylan to my master and now my master to chris2. Something wrong with my DB though ERROR:  column user_id contains null values So I cannot migrate. need to ask mike
merged new mike pending tests into my master
Merge branch 'chris2'
done some events controller rspec tests. 58 pending
Merge branch 'master' of github.com:rkuhel/lost_tribes3
Merge branch 'chris2'