clean up repo one last time
add threadfix-cli to local repo
Merge remote-tracking branch 'upstream/master'