Differentiate re-running all pickmes and all conflicting pickmes for push
Add button and servlet to re-check push for conflicts
Check if pickmes are already merged into master, and if so ignore them
Merge pull request #91 from rschlaikjer/check-if-pickme-in-master

Don't run merge-detection on already merged pickmes.

Sometimes merge-detection can be triggered on pickmes that have been included in master already. The result will always be conflict-master in that case.
Fetch non-ff changes
Merge pull request #90 from rschlaikjer/pull-rebased-repos

Fetch non-ff changes

Explicit fetching triggers non-ff detection. + fixes that. refs/heads is also needed because fetch doesn't resolve the remote branchname properly.
Merge pull request #92 from rschlaikjer/add-rerun-detection-button

Add rerun detection button

Allow pushmasters to manually trigger merge-detection. Useful when a previous push has certed.
Release 0.3.3

 BUG FIXES

 * Don't run merge detection on merged requests (rschlaikjer, #84, #91)
 * Fetch non-ff branches (rschlaikjer, #85, #90)

 IMPROVEMENTS

 * Manually rerun merge detection (rschlaikjer, #86, #92)

 PERFORMANCE TWEAKS

 * Separate git sha retrieval from git merge conflict detection.
   (rschlaikjer, #82, #83)