poetic/our-boxen — pull request #6 by bobobhai (2014-07-10 23:41:22+00:00)
Title: make my config compatible with master

Update and make my config compatible with master