Updated Gemfile and Gemfile.lock to latest gems (exceptions: rspec/ci_reporter/tinymce)
and extend wait time after verification email is sent so the tests won't run before the email is received.
Merge branch 'master' of github.com:ualbertalib/DMPonline_v4
added back .bundle/config configuration file
Merge branch 'master' into deployment, added configuration file .bundle/config back