Removed a few options from vimrc and cleaned up deploy script