Fix racy git reset
Merge branch 'master' of git://github.com/Eyescale/Buildyard
Merge pull request #28 from tribal-tec/master

Fix racy git reset