factories refactor
controller specs refactor
Merge pull request #21 from purple-martins-2013/factories

Factories and controller specs refactor