Fixing raw_inout v input renaming in py2 > py3
Fixing dict ordering bug with multiple templates, switched to list of tuples