Updated tao
Merge branch 'master' of ssh://github.com/travisdesell/tomography