Fixed a lot of TODO's and removed unneccesary code
Merge branch 'master' of http://www.github.com/Nieo/teedee