Clears up the configuration somewhat!!
Fixed broken tests from addition of "-@repo" to Jenkins URL's
Merge pull request #5 from notonthehighstreet/make_setup_sane

Make setup sane