Zip file auto selection + fixes

A7b1abd is related to http://dev.cuckoosandbox.org/issues/216