Disable jedi-vim.
Merge branch 'master' of github.com:iynaix/vimfiles

Conflicts:
	.vim/bundle/syntastic
	.vim/bundle/vim-airline
	.vim/bundle/vim-css3-syntax
	.vimrc