fixed up submodules
added neocomplete shortcuts
merged gitmodules conflict