Changes to quoting - 04/01/14 - 2

Changes to the quoting of the PolicyStore setup commands
Misc Changes