compile fixes - would not compile otherwise with ubuntu 12.10
fixed failing tests on ubuntu 12.10
Merge branch 'master' of https://github.com/xandercrews/mtm