Added factory girl helper method for rspec tests and refactoredtests to use helper
Rebasing rspec test fixing branch - fixed conflicts
Merge pull request #85 from tiger-swallowtails-2014/fixing_model_rspecs

Added factory girl helper method for rspec tests and refactoredtests to ...