Update to latest plone and several fixes
Update gitignore
Merge branch 'master' of github.com:vwc/buildout.locomotec