Updated lambda-defs.txt: Function words + variations on 'and'.
Merge branch 'master' of https://github.com/fredcallaway/hci

Conflicts:
	lambda/lambda-defs.txt