Manual merge of current in-progress bobby work
Merge pull request #22 from rackerlabs/auto-369-execute-policy

Manual merge of current in-progress bobby work