fixes some database activeRecord problems
Merge branch 'master' of github.com:Holderness/Canadian-Tuxedo