Replace locals() and pass only parameters that the templates need
Merge remote-tracking branch 'origin/fix_locals'
Merge branch 'master' of git://github.com/abztrakt/labgeeks-people
Merge branch 'master' into add-permission
Wasn't passing in permission.