'killall' works more reliable than '..quit process'
refactored bin/context
update git unstash alias to use 3-way merge if patch results in conflicts