Fixes handling of {{super}} and {{self}}.

Squashed commit of the following:

commit 916e0048d6d887da60676c2eb86ca661d0b98118
Author: Brian Wickman <wickman@twitter.com>
Date:   Thu Aug 22 16:18:03 2013 -0700

    fix self/super