Fix for elist and some mux compatibility for valid()
yet another fix to elist
Modified README.md for Ambrosia branch.
Merge branch 'master' into ambrosia
Merge branch 'master' into ambrosia
Merge branch 'ashen-shugar' into ambrosia

Conflicts:
	Server/src/functions.c
Add '|' option to parsestr()
Merge branch 'ashen-shugar' into ambrosia
Fix help for parsestr, it was garbled, badly.
More parsestr help foo
Merge branch 'ashen-shugar' into ambrosia
Bunch of updates and some fixes
Some additional changes