Merge both KnowledgeMotion remotesites into one

also https://github.com/atlasapi/atlas-model/pull/218
Optional.fromNullable()?