Move HTCondor* modules up one level and include them in setup.py
Merge pull request #4141 from mmascher/movemodule

Move HTCondor* modules up one level and include them in setup.py