Sync some alias updates

.gitconfig

@@ -53,7 +53,7 @@
 	keepBackup = false;
 	tool = p4merge
 [mergetool "p4merge"]
-	cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
+	cmd = "p4merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\""
 	keepTemporaries = false
 	trustExitCode = false
 	keepBackup = false
@@ -69,9 +69,10 @@
 	pushNonFastForward = false
 	statusHints = false
 [filter "lfs"]
-	clean = git-lfs clean %f
-	smudge = git-lfs smudge %f
 	required = true
+	clean = git-lfs clean -- %f
+	smudge = git-lfs smudge -- %f
+	process = git-lfs filter-process
 [core]
 	excludesfile = /Users/fbarthelemy/.gitignore_global
 [diff]

bin/decorporate

@@ -2,6 +2,7 @@
 
 echo 1. Remove the configuration profiles
 sudo profiles -P | grep -v "configuration" | cut -d \  -f 4 | xargs -L1 echo sudo profiles -R -p
+sudo profiles -D -f
 
 echo 2. Remove JAMF
 sudo rm -r /Applications/Self\ Service.app

bin/kill-sophos

@@ -0,0 +1,9 @@
+#!/bin/sh
+# Disable Sophos On Access
+
+set -o errexit
+sudo defaults write /Library/Preferences/com.sophos.sav.plist AutoLaunch -bool false
+sudo pkill SophosScanD || echo "SophosScanD wasn't running, nothing killed"
+sudo pkill Sophos Anti-Virus || echo "Sophos Anti-Virus wasn't running, nothing killed"
+
+echo "Sophos Murdered."

bin/pod_forceupdate

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+#rm -rf "${HOME}/Library/Caches/CocoaPods"
+#rm -rf "`pwd`/Pods/"
+pod cache clean --all
+pod update