Initial work on a dulwich backend for wikkid.
Fix formatting for assert.
Fix test name.
Bunch of test fixes.
Support file conflicts.
fix most tests.
Simplify commit, add --format=git option.
Fix user id.
Merge trunk.
Add dulwich dependency.
Use posixpath.sep rather than /
Move extra code out of try/except.
Add travis config.