update factory users
update homes index view to correct error
allow for i18n testing
integration tests
Prevent merge conflicts

Merge branch 'master' into continue_integration_tests
Update integration test after merge
Merge pull request #100 from cdcueva/continue_integration_tests

Continue integration tests