Update submodule references
Modify vimrc

Added some more formating stuff...