update pull request to match original code style
Merge branch 'pull.1'
Better match default pyramid1.4 project (named demo)