stash away dirty changes and restore after deploy instead of completely ...

...dropping them, fixes travis-ci/travis-ci#1526, fixes travis-ci/travis-ci#1527