Fix mako security settings

Squashed commit of the following:

commit 9a01434773dcd4cebdd7ab77e0c9f543dae71c90
Author: nuclearmistake <nuclearmistake@gmail.com>
Date:   Tue Apr 30 21:27:43 2013 -0400

    keymaster of puppets

    Change-Id: Iff89ea1bd8b3d0c9c313c7acd7bbf5065df29cfb

commit 8507c9bb846380791b2475e0ad63032de764f6d1
Author: nuclearmistake <nuclearmistake@gmail.com>
Date:   Tue Apr 30 22:49:32 2013 -0400

    are you the gatekeeper?

    Change-Id: I3e340959ef0926ce9d7f6fb95b4d0bf4fe64fa5e

Change-Id: Iff89ea1bd8b3d0c9c313c7acd7bbf5065df29cfb