Updated gem dependencies
Merge branch 'master' into reactor