Release 0.3.6

 BUG FIXES

 * Track worker pids (rschlaikjer, #98)

 PERFORMANCE TWEAKS

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