Merge pull request #45 from leiqin/master

Update some chinese file
Update install.fr.md
Update the blurb about Oyster.com

This was well out of date. Almost two years ago now we switched to
using Python with web.py for our entire website (not just the booking
system). I was one of the main developers on this project, and still
work for Oyster.com.
Merge pull request #46 from benhoyt/patch-1

Update the blurb about Oyster.com
Merge pull request #1 from webpy/master

update from upstream