Add support for template option
Remove salt.ext.six
Match defaults to arguments correctly
Better error message for invalid arguments
Handle states that don't have any defaults