Updated bashrc and vimrc
Tweaked installer script

Conflicts:

	install.sh