.bashrc, alias.sh: added export $VIM
Merge branch 'master' of https://github.com/b4b4r07/dotfiles

Conflicts:
	init/.bash.d/alias.sh
	init/.bashrc