Update vimrc
Update s
Merge branch 'master' into lab-machines

Conflicts:
	bashrc