Merged tardis into omnitool.

Merged tardis into omnitool.
Well spotted.