Updating Rspec and other testing gems
Updating config/environment files to match rails 4.0.11.1
A few more gem updates.
Fixing image height bug on chrome. Not sure if this is a permanent fix, but it does seem to fix the problem.

See this bug for details https://code.google.com/p/chromium/issues/detail?id=422919
Merge pull request #31 from biola/general_updates

General updates