[bug 775316] Upgrade to jingo 0.6.1 and replace jingo.render calls.
Some cleanup