partial gemfile update; pre-merge commit.
Merge branch 'master' of github.com:steveoro/goggles
minor gemfile updates; vers. 4.00.187