Adding FactoryGirl, User mocks
Merge branch 'master' into feature/sites
Adding SitesController, tests
Adding Site factory