Update to match 2014-07-08 ckuehl/dotfiles
Update to chriskuehl dotfiles 2014-08-16
Merge pull request #2 from chriskuehl/for-lynn-2

Update to match 2014-07-08 ckuehl/dotfiles