clean up local repo
clean up local repo
add local jar
Merge remote-tracking branch 'upstream/master'

Conflicts:
	repo/com/denimgroup/threadfix/threadfix-cli/2.0FINAL-SNAPSHOT/maven-metadata.xml
	repo/com/denimgroup/threadfix/threadfix-cli/2.0FINAL-SNAPSHOT/maven-metadata.xml.md5
	repo/com/denimgroup/threadfix/threadfix-cli/2.0FINAL-SNAPSHOT/maven-metadata.xml.sha1
	repo/com/denimgroup/threadfix/threadfix-cli/2.0FINAL-SNAPSHOT/threadfix-cli-2.0FINAL-20140801.061913-1.jar
	repo/com/denimgroup/threadfix/threadfix-cli/2.0FINAL-SNAPSHOT/threadfix-cli-2.0FINAL-20140801.061913-1.jar.md5
	repo/com/denimgroup/threadfix/threadfix-cli/2.0FINAL-SNAPSHOT/threadfix-cli-2.0FINAL-20140801.061913-1.jar.sha1
	repo/com/denimgroup/threadfix/threadfix-cli/2.0FINAL-SNAPSHOT/threadfix-cli-2.0FINAL-20140801.061913-1.pom
	repo/com/denimgroup/threadfix/threadfix-cli/2.0FINAL-SNAPSHOT/threadfix-cli-2.0FINAL-20140801.061913-1.pom.md5
	repo/com/denimgroup/threadfix/threadfix-cli/2.0FINAL-SNAPSHOT/threadfix-cli-2.0FINAL-20140801.061913-1.pom.sha1
	repo/com/denimgroup/threadfix/threadfix-cli/maven-metadata.xml
	repo/com/denimgroup/threadfix/threadfix-cli/maven-metadata.xml.md5
	repo/com/denimgroup/threadfix/threadfix-cli/maven-metadata.xml.sha1