Type command now handles module and module type
Merge branch 'master' of github.com:def-lkb/merlin