Adding future integration tests
Using therubyracer gem
Updating rails
Merge branch 'master' into r11
Merging latest fixes from master
Using separate gemset
Gemfile updates