I still don't know what I was waiting for
Merge branch 'master' of github.com:bcordonn/stash