Don't share history across sessions
Merge branch 'master' of bitbucket.org:streetdaddy/config

Conflicts:
	.bashrc
Vim config - add/remove some plugins and tweak plugin settings
Merge branch 'master' of https://github.com/streetdaddy/dotfiles
NERDTreeMirror removed from local config (not supported anymore)