merge

Change-Id: I07c00e71dfc2fc65fc107cfe2222d60a0edc85a7

diff --cc TODO
index 890dead,890dead..124d39f
--- 1/TODO
--- 2/TODO
+++ b/TODO
@@@ -1,7 -1,7 +1,4 @@@
  List of things to do:
--
-- - Add support for build IDs (partially done)
-- - Multi arch repos (partially done)
   - Support kickstart magic
     Add addition options per image to describe how it should be created, i.e. image type and other options
     The generated kickstart files should then have the line on top that can be evaluated by mic 

diff --cc kswriter/KSWriter.py
Simple merge