Merge pull request #40 from MartinNowak/cleanupMergeConflict

cleanup leftover from merge conflict
Merge pull request #41 from MartinNowak/fixPathSeperators

fix expanding zip files created on Windows
Merge pull request #42 from MartinNowak/zipIgnoreRules

don't zip .git* and .DS_Store files
Merge pull request #43 from jordisayol/master

add "dustmite" binary on deb/rpm packages