Add support for types as variables
Merge branch 'add_variable_matcher' of git://github.com/hairyhum/sheriff