Put back the version, which accidentally got bumped down due to branch differences.
Add new node for simple version of CASE.
Merge from trunk.
merge mmcm: Add parsing of simple CASE.

https://code.launchpad.net/~mmcm/akiban-sql-parser/simple-case/+merge/177936