filemode false
Merge branch 'master' of github.com:dansackett/dotfiles

Conflicts:
	.vim/bundle/python-mode
	.vim/bundle/vim-less
	.vim/bundle/vundle
Merge branch 'master' of github.com:dansackett/dotfiles
Syntax for vim