Update fabfile and tweak tpl