Rearranged some config so it's easier to find.
Updated plugins.
Updated submodules.
Updated submodules.