Better git stash handling (redux)

Implement the approach outlined in issue: #42 (closed)

Let's see if this turns out to be more reliable in the long run.