fix factories
configure for FactoryGirl short syntax
update Gemfile
add rails_helper
update option_spec.rb
update user_spec.rb
update activemerchant in Gemfile
mailer specs
update Foundation
update colors
Fix styles
Fix password resets