buildout: removed option environment-vars, this option is not supported by buildout >= 2
Merge branch 'develop' of github.com:liqd/adhocracy into develop
Fix: thumbnail tests are broken #377