Add a per-column type

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
Set bare = true

Signed-off-by: David Scott <dave.scott@eu.citrix.com>
Add .merlin

Signed-off-by: John Else <john.else@citrix.com>