Merge pull request #81 from rwz/master

Fixed failing ActiveSupport specs
Removed custom to_json handling for ok_json