added line in bashrc to set EDITOR to vim
Merge branch 'master' of https://github.com/tboz203/config

Conflicts:
	bashrc