Remove extraneous controller specs
Merge factories to a single file
Update gitignore
Remove comments
Merge pull request #39 from MarcGarreau/clean-up-tests

Clean up tests