Added new submodules and set .vimrc to noncompatible
merged with master