Use latest version of zc.buildout and restaure travis tests
Merge branch 'master' into search-excerpt