Updated some strings and logic for screen-scraping
Upstream branch should not include the debian/ directory
Imported Upstream version 1.7