config/application.rb changes and adding rspec stuff
Merge branch 'master' of github.com:pushysocket/site