Added a new output mode: TinyMUX (--tinymux)
Added info about the --tinymux switch
blindfix: change string concat to work on python3
Merge branch 'marado-master'