Added submodule for neocomplcache. Removed spurious directory.
Added a bunch of mappings to .gitmodules
Fixed merge failure in .gitmodules
merge conflict resolution
Merge branch 'master' of github.com:dvogel/dotfiles
Updated Python OmniComplete.