reorganizing blah dee blah
Merge branch 'master' of git://github.com/abresee/config