Fixed two small bugs when importing addon from zipfile.

[swaner]

Not sure there is a better solution to solve my issues, but this way works for me. Use this pull request or just fix it manually yourself.

[genemars]

fix applied manually, see: https://github.com/genielabs/HomeGenie/commit/bc84b28d59dc1e948af995f4a11888940e731c96