Merge branch 'master' of github.com:spencerdeinum/dotfiles
Remove supertab

Signed-off-by: Spencer Deinum <spencerdeinum@gmail.com>
Add you complete me and better php omnifunc

Signed-off-by: Spencer Deinum <spencerdeinum@gmail.com>
Merge branch 'master' of github.com:spencerdeinum/dotfiles

Signed-off-by: Spencer Deinum <spencerdeinum@gmail.com>

Conflicts:
	.gitmodules
	vim/.vimrc