vim is now setup, awesome!
Merge branch 'master' of https://github.com/andsild/dotfiles
old vim stuff

Conflicts:
	deprecated/vim/.vim/bundle/CoVim
	deprecated/vim/.vim/bundle/jedi-vim
	deprecated/vim/.vim/bundle/nerdtree
	deprecated/vim/.vim/bundle/syntastic
	deprecated/vim/.vim/bundle/tagbar
	deprecated/vim/.vim/bundle/tcomment_vim
	deprecated/vim/.vim/bundle/undotree
	deprecated/vim/.vim/bundle/vim-powerline
	deprecated/vim/.vim/bundle/vim-vmath
	deprecated/vim/.vim/bundle/vimfox
	deprecated/vim/.vim/bundle/xterm-color-table.vim
	deprecated/vim/bundle/CoVim
	deprecated/vim/bundle/jedi-vim
	deprecated/vim/bundle/nerdtree
	deprecated/vim/bundle/powerline
	deprecated/vim/bundle/syntastic
	deprecated/vim/bundle/tagbar
	deprecated/vim/bundle/tcomment_vim
	deprecated/vim/bundle/undotree
	deprecated/vim/bundle/vim-powerline
	deprecated/vim/bundle/vim-vmath
	deprecated/vim/bundle/vimfox
	deprecated/vim/bundle/xterm-color-table.vim