Sunspot should not use 2G
Resolved conflicts
Merge branch 'master' of github.com:tunacasserole/omni
Resolved conflicts
Merge branch 'master' of github.com:tunacasserole/omni
Commented the BUILDIT conn reference in migration file
Resolved conflicts
Merge branch 'master' of github.com:tunacasserole/omni
Removed duplicate migrations
Merge branch 'master' of github.com:tunacasserole/omni
Resolved conflicts
Gemfile
Local
Merge branch 'master' of github.com:tunacasserole/omni
Changed HQMessage to HqMessage,
Chnaged ID to Id