Fix some syntax errors. I need to get the wiki up soon.
Merge remote-tracking branch 'origin/master'