changes to vimrc, and teamocil