RSpec, FactoryGirl, Spork and user tests
Merge branch 'master' of https://github.com/hellaxe/muscat