add support for interpolated_coffee within underscore templates (<% %>)
Merge pull request #154 from philippotto/master

Add support for interpolated_coffee within underscore templates (<% %>)
Merge remote-tracking branch 'upstream/master'