Bug fix: proper escaping in eruby.  Fixes #29.
Merge remote-tracking branch 'upstream/master'