Check if pickmes are already merged into master, and if so ignore them

Checking pickmes that are already merged into master would result in a conflict-master tag, since there would be nothing to commit. 

Before conflict checking a pickme against master, check if it is in master. If so, break.
Before checking a pickme against a second pickme, check the second pickme is not in master.

To hopefully avoid running rev-list more than is necessary, do very basic caching of SHAs that are known to be in master.
Actually, git branch isnt porcelain.

`git merge-base origin/master current_branch` should equal to `git rev-parse ocurrent_branch` if merged