fixed all file zipping and emailing edge case bugs, now displaying a bit more info to user
Merge remote-tracking branch 'origin/master'