minor tweaks base on the work of the test web app repo

There were a few issues I worked out with the guys at saltstack and needed to make some tweaks to avoid some issues that seem to be bugs.