Install https://github.com/ervandew/supertab.git bundle as a submodule.
tidy the vimrc
merge?