implement beginning convo controller tests, delete convo show action
wip
wip - factory working
wip - factories
remove gems from application.js that had been removed from gemfile
Merge branch 'master' into controller-tests
fix users_spec to test sign-in, etc.
wip controller tests
merge conflict