Change typedefs to using.
Merge branch 'dev' of github.com:flavioc/meld into dev