merge with dev and resolv conflicts

setup/so-functions

@@ -838,6 +838,7 @@ firewall_generate_templates() {
 
 }
 
+<<<<<<< HEAD
 fleet_pillar() {
 
 	local pillar_file="$temp_install_dir"/pillar/minions/"$MINION_ID".sls
@@ -850,6 +851,8 @@ fleet_pillar() {
 		"" > "$pillar_file"
 }
 
+=======
+>>>>>>> remotes/origin/dev
 generate_passwords(){
   # Generate Random Passwords for Things
   MYSQLPASS=$(tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 20 | head -n 1)

setup/so-setup

@@ -367,14 +367,14 @@ fi
 
 set_main_ip >> $setup_log 2>&1
 
+host_pillar >> $setup_log 2>&1
+
 if [[ $is_minion ]]; then
 	set_updates >> $setup_log 2>&1
 	copy_ssh_key >> $setup_log 2>&1
 fi
 
-if [[ "$OSQUERY" = 1 ]]; then
-	host_pillar >> $setup_log 2>&1
-fi
+
 
 # Begin install
 {