Updated to pull rubygems via https
We don't need to track Gemfile.lock
Merge branch 'master' into local-develop