Update bashrc and vimrc
Assorted changes
Remove stupid vim directories
Merge branch 'master' of https://github.com/Dwakus/dotfiles

Conflicts:
	vim/.netrwhist
	vimrc