add Gemfile.local to global gitignore
Merge remote-tracking branch 'origin/master'