Merge branch 'master' of github.com:Pylons/pyramid
add note about custom args to python when using command-line scripts