Merge pull request #230 from jonnytpuppet/multiple_remotes