Revert "Merge pull request #39 from femmestem/master"

This reverts commit 20720bb53d865b32c98ff5874a5c166c51cf94a4, reversing
changes made to 6634b553c1b5bf21a9cfdc3fcd9dfdcc3e2092ad.
Revert "Merge pull request #38 from spring-peepers-2014/chore/specs_and_factories"

This reverts commit 87ca53b13971d2698c3c12a5456a586c41e20529, reversing
changes made to 20720bb53d865b32c98ff5874a5c166c51cf94a4.
Unmerge branch with unfinished tests, to be merged when complete