String comparison error: "a" is not u"a", but "a" == u"a"
Merge pull request #102 from rschlaikjer/fix-unicode-string-compare

String comparison error: "a" is not u"a", but "a" == u"a"
Release 0.3.6

 BUG FIXES

 * Track worker pids (rschlaikjer, #98)
 * Skip pickmes in conlfict detection if they are no longer valid
   (rschlaikjer, #101, #102)

 IMPROVEMENTS

 * Include stdout on conflict-master pickmes (rschlaikjer, #100)

 PERFORMANCE TWEAKS

 * Merge conflict detection uses multiple threads (rschlaikjer, #99)