changed tp integration to use team id
Commited an unnecessary line of code
Merge branch 'master' of https://github.com/foresterh/marvin