add macosx ppp-options for vpn
update it
.
update
Merge branch 'master' of git.fm:zhangyan/sperm

Conflicts:
	utils/hosts
	www