Merge branch 'release/0.2.2' into develop
allow for pypy & failures
install smmap from source
parameterize remote name
added tests (failing - need ur help @smn)
fix tests
Merge pull request #24 from universalcore/feature/issue-24-enable-merging-with-multiple-remotes

enable merging with multiple remotes
harden but Im not sure if this is correct
test does not highlight the problem
test does not highlight the problem
test does not highlight the problem
test does not highlight the problem
this seems to be it
update test
Merge branch 'feature/issue-26-harden-fast-forward' into develop
version bump
Merge branch 'release/0.2.3'