Added histcontrol
Merge branch 'master' of https://github.com/danjenson/dotfiles