Update to match 2014-07-08 ckuehl/dotfiles
Update to chriskuehl dotfiles 2014-08-16