Avoid shadowing fields named "result", "other", or "o"
Merge pull request #40 from square/rice/result_field

Handle a field named "result", "other", or "o"
Merge remote branch 'upstream/master'