Merge branch 'hotfix/fix_change_password_recaptcha_errors'
Merge branch 'release/2.5.17'
Merge branch 'release/2.5.18'
Updating Gemfile to include god.  Updating rvmrc to use local gems
Fixing bug in view for creating recurring tasks