Removed unused gvimrc config.
Updated mappings.
Stopped loading NERDTree on vim start.
Added Jinja and RST highlighting and replaced python-mode with syntastic.
Updated vim submodules.