Update config.rb
Merge remote-tracking branch 'origin/master' into draft-2014-08-09