Adding basic sanity test for /feed
Slight refactor of feed route, adding feed for one or more Gushim (niryariv/opentaba-server#20)
Empty titles are now copies of content
Merge branch 'feature/test-for-feed' into feature/gush-feed

Conflicts:
	app.py
adding tests for new single and multi gush feeds
Merge remote-tracking branch 'upstream/master' into HEAD
Adding format extension to URLs (#niryariv/38)
Fixing tests to work with new .json/.atom routes
Merge pull request #43 from alonisser/master

A test suite for malformed html for the parser
Merge pull request #44 from alonisser/master

Updated scraper test to be more DRY
add CONTRIBUTING per #22
Merge branch 'master' of github.com:niryariv/opentaba-server
Fixing tests to work with new .json/.atom routes
Merge branch 'feature/route-format-suffix' of github.com:shevron/opentaba-server into feature/route-format-suffix

Conflicts:
	Tests/functional_tests/test_return_json.py
Merge pull request #39 from shevron/feature/route-format-suffix

Adding type suffix to routes
Adding some IDE related files to gitignore (PyDev, PyCharm)
PEP8-formatting code in Tests
PEP8-formatting code in tools/
PEP8-formatting code in project root
Merge pull request #47 from shevron/pep8-cleanup

PEP8 cleanup, resolving niryariv/opentaba-server#45