Expand history file in OS X.
Merge branch 'master' of github.com:parkr/dotfiles

* 'master' of github.com:parkr/dotfiles:
  i guess i didn't like those?