work in progress--need working factories
remove unnecessary helpers and add to conversations_controller_spec
comment out unnecessary tests
merge conflicts
adjust spec_helper for full simplecov coverage
wip - feature spec on sending form--messing with token_expires_at
add feature specs - at 80% test coverage
Merge branch 'master' into tests
add to feature specs - 82% coverage