Brandon sonatype5

pull sonatype5 to master, b/c the sub branches are not wanting to merge on github, this will be faster. I'll close the others.