.gitconfig update: Do not force ff-only merges.
Updated submodules to latest commits.
Added config file for Terminator.