added gush feedi, pep8 fixes
reverting before chevron changes
Merge branch 'master' of github.com:niryariv/opentaba-server
fixed citymap to opentaba in installation and added reference for the new feeds
merge from upstream
Merge remote-tracking branch 'upstream/master'
with testing html from mor
Added a test suite for the html scraping part, and changed the scraper code to make it testable
Merge remote-tracking branch 'upstream/master'
before sending a pull request
Merge pull request #43 from alonisser/master

A test suite for malformed html for the parser