vim: Update highlighting for long python lines
vimperator: add tabs to open completion
Merge branch 'master' of github.com:bitterjug/dotfiles

Conflicts:
	vim/vimrc.vim