Merge branch 'master' of https://github.com/jfding/mic

Conflicts:
	distfiles/mic.conf

diff --cc distfiles/mic.conf
index ec36a8a,4957be9..ffffd24
--- 1/distfiles/mic.conf
--- 2/distfiles/mic.conf
+++ b/distfiles/mic.conf
@@@ -11,9 -10,8 +11,10 @@@ distro_name = Tize
  
  ; proxy = http://proxy.yourcompany.com:8080/
  ; no_proxy = localhost,127.0.0.0/8,.yourcompany.com
-  
 +# Prefix that is added in front of files that are produced.
 +; name_prefix = output
+ ; ssl_verify = no
+ 
  [convert]
  ; settings for convert subcommand
  

diff --cc mic/imager/baseimager.py
Simple merge