merge with dev and resolv conflicts

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
 {