refactored specs, added FactoryGirl, functionality remains the same
fixed gemlock file merge conflict
deleted unneccesary files
Merge pull request #7 from ukutaht/test_cleanup

refactored specs, added FactoryGirl, functionality remains the same