break out config to settings.rb
Merge remote-tracking branch 'origin/master'