Merged variable types (wildcard and type variables)

https://github.com/kfgodel/diamond/issues/25