Rename Alias to AliasType so that it is consistent with other type names.
Remove the unused UserType.
Merge pull request #150 from pjonsson/type-cleanup

Type cleanup