tidied up buildout, upgraded to loris 2.0.0-beta1, removed excess files