merge with master
Merge branch 'master' of github.com:tbdale/scala-HTCondor