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
Adding format extension to URLs (#niryariv/38)
Fixing tests to work with new .json/.atom routes
merge from upstream
added parse test htmls
Merge pull request #41 from florpor/master

added parse test htmls. the failure is because mmi site problem
Merge remote-tracking branch 'upstream/master'
with testing html from mor
fix parse gush test
fixed scrape gush id
Merge pull request #42 from florpor/master

Fixed tests
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
Minor
using setup and teardown correctly
Merge pull request #44 from alonisser/master

Updated scraper test to be more DRY
add CONTRIBUTING per #22