big catchup commit
updating files for web2py 2.95