support full repository urls and the team flag
fix merge conflicts
Merge branch 'jwmarshall-master'