Remove some 'typename's since older versions of g++ don't like.
Merge branch 'master' of github.com:jthornber/thin-provisioning-tools