Updating for new version of salt
Updates for new version of Saltstack

Changed a bunch of stuff and added the underpinnings for the Bro intel
framework.
Commenting out Intel stuff by default
Changes for new salt version and bro framework
Commented out bro restart
fix
Merge branch 'dev' into test

Conflicts:
	opt/onionsalt/salt/sensor/init.sls
Merge branch 'test'