Fixed the things that were not working properly
Merge branch 'master' of https://github.com/koansys/gae_pyramid into make_it_work

Conflicts:
	buildout.cfg
Merge pull request #1 from sontek/make_it_work

Fixed the things that were not working properly