Strip +x from test_entities.py
Improve test_entities, and do not run it by default (since it can be rather slow without an SSD)
Fix various PEP8 violations
Merge pull request #221 from phihag/fix-pep8-violations

Fix various PEP8 violations
Revert change to mako file
Drop is_filecheeck_test
Test for PEP8 violations
Make test_pep8 ignore template files (and make it conform PEP8 ;) )
Merge pull request #222 from phihag/test-pep8

Test for PEP8 violations
Merge branch 'develop' into milestone_easier_buildout_merge_develop

Conflicts:
	docs/conf.py
	ez_setup.py