submodule updates and deactivated syntastic
deleted vim-pandoc-extras files
various
resolving merge conflict
resolved merge conflict
more submodule updates