Add and switch remotes. Fixes #158. Fixes #216