Removed unnecessary sys.path manipulation.
Added processing of common filename components.
Merge /srv/GITROOT/Tardis