Updated .gitignore, moved a few files around and fixed remotes.