Do commit/stash/reset rather than stash --keep-index
fixes #221
Merge branch 'master' into dev-form
CudiBundle WIP