Updated spelling lists and updated submodules
fixed spelling merge conflict