added history control
Merge branch 'master' of github.com:flopp/dotfiles