Updating to latest gemset, version, rvmrc
Merge branch 'master' into timeZoneFix