Merge both KnowledgeMotion remotesites into one

also https://github.com/atlasapi/atlas-model/pull/218
That would, in this case, only be more long and annoying, I'm afraid.