Add .vimrc
Add .vimrc to setup.sh and cleanup.sh.
Merge cleanup.sh

Conflicts:
	cleanup.sh