Merge pull request #78 from Yelp/release-candidate

Release 0.3.1

BUG FIXES

* Ensure submodules are refreshed for merge conflict detection
  (rschlaikjer, #73, #75)
* Ensure the proper remote is fetched for merge conflict detection
  (rschlaikjer, #74, #75)
* Hard reset and clean pre-checkout to prevent checkout being blocked
  by unstaged changes (rschlaikjer, #76)
* Force delete / recreate of test branches, to fix branches that
  might not have been cleaned up properly (rschlaikjer, #76)

PERFORMANCE TWEAKS

* For performance reasons, only perform a fetch when a new remote or
  pickme has been added (rschlaikjer, #76)
When depickme-ing, only requeue pickmes that conflict-pickme
Add tests
Merge pull request #80 from rschlaikjer/requeue-only-conflicting-pickmes

When depickme-ing, only requeue pickmes that conflict-pickme
Release 0.3.2

 PERFORMANCE TWEAKS

 * Only requeue existing conflicted pickme's when a pickme
   is removed. (rschlaikjer, #79, #80)