Removing experimental TP.
Merge remote-tracking branch 'upstream/master' into cleanup
Remove reference to TP_R.
Merge branch 'master' into cleanup
Merge pull request #300 from scottpurdy/cleanup

Removing experimental TP.
Merge branch 'master' into breznak-cleanup