setup repo remote and merge

raised in [elasticgit #25](https://github.com/universalcore/elastic-git/issues/25)