Switch to update_type statements.
Merge pull request #134 from basho/feature/csm/teams

Switch to update_type statements.
Resolve update_type problems.
Remove debugging statements.