Explicity specifing history file and history settings
Some vim improvements
Merge branch 'master' of github.com:chrisfleming/my-enviroment
Removing .orig file