Merge pull request #23 from jcoyne/convert_tests_to_factory_girl

Convert tests to use FactoryGirl. Removed Fixie
Get the tests working
Made some constants to remove the rspec warnings