better/update now updates from latest changes from live. Closes #11.

better/update

@@ -221,8 +221,17 @@ processGenericHook(){
 	ensurePersonIsLoggedIn
 	createGlobals
 	branchName=$(runIn $contentDirectory "git branch | sed -n -e 's/^\* \(.*\)/\1/p'")
-	echo "  · Updating branch ${branchName}"
-	runIn $contentDirectory "git pull live \"$branchName\""
+	echo "  · Pulling latest changes from live and updating branch ${branchName}"
+	# runIn $contentDirectory "git pull live \"$branchName\""
+	if [ "$branchName" == "master" ]; then
+		echo "    · Already in master, pulling from live."
+		runIn $contentDirectory "git pull live master"
+	else
+		runIn $contentDirectory "git checkout master"
+		runIn $contentDirectory "git pull live master"
+		runIn $contentDirectory "git checkout ${branchName}"
+		runIn $contentDirectory "git merge master"
+	fi
 	goodbye
 }