resolve #153: git ship errors with empty commit message

@kevgo 
`git clean -d -f` doesn't do what I need here.

http://stackoverflow.com/questions/5807137/git-how-to-revert-uncommitted-changes-including-files-and-folders

There should be no untracked files as this is a `git merge --squash`