Upgrade Rack 1.1.3 => 1.1.5
Removing vendored Rails.
Remove vendored gems.
Remove lib versions of ruby-msg and ruby-ole
Remove applied patch - now in git repo we will pull rails from.
Handle ruby gem dependencies with bundler.
No need to load rspec in config/environments/test.rb, handled using bundle groups
Make sure initializer has run when we try to turn off papertrail for the test environment.
Update require for gem rather than vendored rails.
Load the mocks we need rather than trying to require classes from the Rails tests.
Require not needed now we're using bundler.
Don't need rdoctask with newer version of rake.
Switch to using bundle exec.
Upgrade Rails and JSON gem to get fixes for  CVE-2013-0276, CVE-2013-0277 and CVE-2013-0269
Don't run commonlib tests.
Run tests with bundler
Merge branch 'feature/use-bundler'
Merge remote-tracking branch 'origin/master' into mark-dev

Conflicts:
    config/environment.rb
    vendor/gems/rack-1.1.5/.specification
    vendor/gems/rack-1.1.5/COPYING
    vendor/gems/rack-1.1.5/KNOWN-ISSUES
    vendor/gems/rack-1.1.5/RDOX
    vendor/gems/rack-1.1.5/README
    vendor/gems/rack-1.1.5/SPEC
    vendor/gems/rack-1.1.5/bin/rackup
    vendor/gems/rack-1.1.5/contrib/rack_logo.svg
    vendor/gems/rack-1.1.5/example/lobster.ru
    vendor/gems/rack-1.1.5/example/protectedlobster.rb
    vendor/gems/rack-1.1.5/example/protectedlobster.ru
    vendor/gems/rack-1.1.5/lib/rack.rb
    vendor/gems/rack-1.1.5/lib/rack/adapter/camping.rb
    vendor/gems/rack-1.1.5/lib/rack/auth/abstract/handler.rb
    vendor/gems/rack-1.1.5/lib/rack/auth/abstract/request.rb
    vendor/gems/rack-1.1.5/lib/rack/auth/basic.rb
    vendor/gems/rack-1.1.5/lib/rack/auth/digest/md5.rb
    vendor/gems/rack-1.1.5/lib/rack/auth/digest/nonce.rb
    vendor/gems/rack-1.1.5/lib/rack/auth/digest/params.rb
    vendor/gems/rack-1.1.5/lib/rack/auth/digest/request.rb
    vendor/gems/rack-1.1.5/lib/rack/builder.rb
    vendor/gems/rack-1.1.5/lib/rack/cascade.rb
    vendor/gems/rack-1.1.5/lib/rack/chunked.rb
    vendor/gems/rack-1.1.5/lib/rack/commonlogger.rb
    vendor/gems/rack-1.1.5/lib/rack/conditionalget.rb
    vendor/gems/rack-1.1.5/lib/rack/config.rb
    vendor/gems/rack-1.1.5/lib/rack/content_length.rb
    vendor/gems/rack-1.1.5/lib/rack/content_type.rb
    vendor/gems/rack-1.1.5/lib/rack/deflater.rb
    vendor/gems/rack-1.1.5/lib/rack/directory.rb
    vendor/gems/rack-1.1.5/lib/rack/etag.rb
    vendor/gems/rack-1.1.5/lib/rack/file.rb
    vendor/gems/rack-1.1.5/lib/rack/handler.rb
    vendor/gems/rack-1.1.5/lib/rack/handler/cgi.rb
    vendor/gems/rack-1.1.5/lib/rack/handler/evented_mongrel.rb
    vendor/gems/rack-1.1.5/lib/rack/handler/fastcgi.rb
    vendor/gems/rack-1.1.5/lib/rack/handler/lsws.rb
    vendor/gems/rack-1.1.5/lib/rack/handler/mongrel.rb
    vendor/gems/rack-1.1.5/lib/rack/handler/scgi.rb
    vendor/gems/rack-1.1.5/lib/rack/handler/swiftiplied_mongrel.rb
    vendor/gems/rack-1.1.5/lib/rack/handler/thin.rb
    vendor/gems/rack-1.1.5/lib/rack/handler/webrick.rb
    vendor/gems/rack-1.1.5/lib/rack/head.rb
    vendor/gems/rack-1.1.5/lib/rack/lint.rb
    vendor/gems/rack-1.1.5/lib/rack/lobster.rb
    vendor/gems/rack-1.1.5/lib/rack/lock.rb
    vendor/gems/rack-1.1.5/lib/rack/logger.rb
    vendor/gems/rack-1.1.5/lib/rack/methodoverride.rb
    vendor/gems/rack-1.1.5/lib/rack/mime.rb
    vendor/gems/rack-1.1.5/lib/rack/mock.rb
    vendor/gems/rack-1.1.5/lib/rack/nulllogger.rb
    vendor/gems/rack-1.1.5/lib/rack/recursive.rb
    vendor/gems/rack-1.1.5/lib/rack/reloader.rb
    vendor/gems/rack-1.1.5/lib/rack/request.rb
    vendor/gems/rack-1.1.5/lib/rack/response.rb
    vendor/gems/rack-1.1.5/lib/rack/rewindable_input.rb
    vendor/gems/rack-1.1.5/lib/rack/runtime.rb
    vendor/gems/rack-1.1.5/lib/rack/sendfile.rb
    vendor/gems/rack-1.1.5/lib/rack/server.rb
    vendor/gems/rack-1.1.5/lib/rack/session/abstract/id.rb
    vendor/gems/rack-1.1.5/lib/rack/session/cookie.rb
    vendor/gems/rack-1.1.5/lib/rack/session/memcache.rb
    vendor/gems/rack-1.1.5/lib/rack/session/pool.rb
    vendor/gems/rack-1.1.5/lib/rack/showexceptions.rb
    vendor/gems/rack-1.1.5/lib/rack/showstatus.rb
    vendor/gems/rack-1.1.5/lib/rack/static.rb
    vendor/gems/rack-1.1.5/lib/rack/urlmap.rb
    vendor/gems/rack-1.1.5/lib/rack/utils.rb
    vendor/gems/rack-1.1.5/rack.gemspec
    vendor/gems/rack-1.1.5/test/spec_rack_auth_basic.rb
    vendor/gems/rack-1.1.5/test/spec_rack_auth_digest.rb
    vendor/gems/rack-1.1.5/test/spec_rack_builder.rb
    vendor/gems/rack-1.1.5/test/spec_rack_camping.rb
    vendor/gems/rack-1.1.5/test/spec_rack_cascade.rb
    vendor/gems/rack-1.1.5/test/spec_rack_cgi.rb
    vendor/gems/rack-1.1.5/test/spec_rack_chunked.rb
    vendor/gems/rack-1.1.5/test/spec_rack_commonlogger.rb
    vendor/gems/rack-1.1.5/test/spec_rack_conditionalget.rb
    vendor/gems/rack-1.1.5/test/spec_rack_config.rb
    vendor/gems/rack-1.1.5/test/spec_rack_content_length.rb
    vendor/gems/rack-1.1.5/test/spec_rack_content_type.rb
    vendor/gems/rack-1.1.5/test/spec_rack_deflater.rb
    vendor/gems/rack-1.1.5/test/spec_rack_directory.rb
    vendor/gems/rack-1.1.5/test/spec_rack_etag.rb
    vendor/gems/rack-1.1.5/test/spec_rack_fastcgi.rb
    vendor/gems/rack-1.1.5/test/spec_rack_file.rb
    vendor/gems/rack-1.1.5/test/spec_rack_handler.rb
    vendor/gems/rack-1.1.5/test/spec_rack_head.rb
    vendor/gems/rack-1.1.5/test/spec_rack_lint.rb
    vendor/gems/rack-1.1.5/test/spec_rack_lobster.rb
    vendor/gems/rack-1.1.5/test/spec_rack_lock.rb
    vendor/gems/rack-1.1.5/test/spec_rack_logger.rb
    vendor/gems/rack-1.1.5/test/spec_rack_methodoverride.rb
    vendor/gems/rack-1.1.5/test/spec_rack_mock.rb
    vendor/gems/rack-1.1.5/test/spec_rack_mongrel.rb
    vendor/gems/rack-1.1.5/test/spec_rack_nulllogger.rb
    vendor/gems/rack-1.1.5/test/spec_rack_recursive.rb
    vendor/gems/rack-1.1.5/test/spec_rack_request.rb
    vendor/gems/rack-1.1.5/test/spec_rack_response.rb
    vendor/gems/rack-1.1.5/test/spec_rack_rewindable_input.rb
    vendor/gems/rack-1.1.5/test/spec_rack_runtime.rb
    vendor/gems/rack-1.1.5/test/spec_rack_sendfile.rb
    vendor/gems/rack-1.1.5/test/spec_rack_session_cookie.rb
    vendor/gems/rack-1.1.5/test/spec_rack_session_memcache.rb
    vendor/gems/rack-1.1.5/test/spec_rack_session_pool.rb
    vendor/gems/rack-1.1.5/test/spec_rack_showexceptions.rb
    vendor/gems/rack-1.1.5/test/spec_rack_showstatus.rb
    vendor/gems/rack-1.1.5/test/spec_rack_static.rb
    vendor/gems/rack-1.1.5/test/spec_rack_thin.rb
    vendor/gems/rack-1.1.5/test/spec_rack_urlmap.rb
    vendor/gems/rack-1.1.5/test/spec_rack_utils.rb
    vendor/gems/rack-1.1.5/test/spec_rack_webrick.rb
    vendor/gems/rack-1.1.5/test/spec_rackup.rb