Updating to freshest copy of master

Merge branch 'master' of https://github.com/schbetsy/OwnMyContent into testing_install
Merge branch 'master' of https://github.com/schbetsy/OwnMyContent into testing_install
Merge branch 'master' of https://github.com/schbetsy/OwnMyContent into user_model_rspec
started model tests
Merge pull request #20 from schbetsy/user_model_rspec

User model rspec