update makefile ... fixed buildout
Merge branch 'master' of github.com:bird-house/pyramid-phoenix

Conflicts:
	.gitignore