committing web2py to github
Merge branch 'master' of https://github.com/evancaldwell/siri

git told me to merge them before I push to Github