Removed conflict comments from previous updates.
Merge branch 'master' of https://github.com/rjerickson/tsu-2.0
Merge branch 'master' of https://github.com/rjerickson/tsu-2.0

Pulled down changes from the master.