Merge pull request #3 from audibleblink/master

Merged team update
Merge pull request #4 from audibleblink/master

fix bugs and adds smarter texting feature
add groups migration/model, fix user model test
add groups model
Merge remote-tracking branch 'alex_repo/master'
address merge conflicts