Removed vestigial confs, changed mysql_error and mysql_slow to be more consistent with the rest of the confs
Merge branch 'master' of git://github.com/ConsumerAffairs/salt-states
Merge branch 'master' of git://github.com/ConsumerAffairs/salt-states
Merge branch 'master' of git://github.com/ConsumerAffairs/salt-states
add salt-syndic if enabled in grains
add nacl.quick_push
switch docsim from circus to supervisor
add ppa: nginx/stable
Merge branch 'master' of mgmt.staging.iso:/srv/salt