Merge pull request #1 from arlingtonruby/master

Config all the things!
Why you ackin so cray cray?
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Why you ackin so cray cray?