Updates
Merge branch 'master' of https://github.com/kwkroeger/Dotfiles

* 'master' of https://github.com/kwkroeger/Dotfiles:
  Update osx file for Yosemite