Minor changes, just a sync:
- correction of psf plot label
- included comments about how to make a keck pupil
- some reformating in yao_wfs.i, no change.
Merge branch 'master' of github.com:frigaut/yao

Conflicts:
	yao_wfs.i