Revert "Merge pull request #9 from DigitalDesign-Spring2013/te"

This reverts commit b00e9cc5da043a3f08543b4700f15b2bcb4fb3b2, reversing
changes made to d2099b6dc7ab2c521805812e0f7cee54dc401856.