Restored rspec
Added capybara requires to spec_helper.rb
Removed whiny_nils from test env
removed machinist, properly configured factory_girl