diff --git a/.debian b/.apt-get
similarity index 56%
rename from .debian
rename to .apt-get
index 51031397..1b6a1734 100644
--- a/.debian
+++ b/.apt-get
@@ -2,4 +2,6 @@ INSTALL="sudo apt-get -y install"
 $INSTALL zsh
 $INSTALL tmux
 $INSTALL emacs24-nox
-$INSTALL nmap
\ No newline at end of file
+$INSTALL nmap
+$INSTALL python2.7
+$INSTALL python-pip python-dev
\ No newline at end of file
diff --git a/.emacs.d b/.emacs.d
index 6cb2971d..76297229 160000
--- a/.emacs.d
+++ b/.emacs.d
@@ -1 +1 @@
-Subproject commit 6cb2971d55b295ae652000297ce46c96895b68fb
+Subproject commit 762972297eddff85249c8ce57eaa385d2bb0cad5
diff --git a/setup.sh b/setup.sh
index e3e065e2..8a5eec8d 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,48 +1,18 @@
 #!/bin/bash
+# Assumes that gcc, make and git as well as a package manager (brew,
+# apt-get) is installed on the system.
+
 # Go to the source directory of this script.
 cd "$(dirname "${BASH_SOURCE}")"
 
-function install_essentials() {
-    case `uname` in
-	'Darwin')
-	    hash gcc &>/dev/null
-	    if [ $? -ne 0 ]
-	    then
-		echo "gcc not found."
-		exit
-		case `sw_vers | grep ProductVersion | awk '{print $2}' | awk 'BEGIN{FS="."}{print $2}'` in
-		    '8')
-			echo 'Mountain Lion Detected.'
-			;;
-		    '7')
-			echo 'Lion Detected.'
-			;;
-		    *)
-			exit -1
-			;;
-		esac
-	    else
-		echo "gcc found."
-		source ~/.osx
-	    fi
-	    hash brew &>/dev/null && echo "brew found." || ruby -e "$(curl -fsSL https://raw.github.com/mxcl/homebrew/go)"
-	    source .brew
-	    ;;
-	'Linux')
-            echo "Linux detected."
-	    hash apt-get &>/dev/null || (echo 'apt-get is missing.' && exit)
-            echo "apt-get found."
-	    sudo apt-get -y install build-essential
-            sudo apt-get -y install git
-            sudo git clone git@github.com:IvanMalison/dotfiles.git
-            cd dotfiles
-            source .debian
-	    ;;
-	*)
-	    echo "Operating System not recognized; aborting."
-	    exit
-    esac
-}
+case `uname` in
+    'Darwin')
+	source .brew
+	;;
+    'Linux')
+	source .apt-get
+        ;;
+esac
 
 function install_python_packages() {
     sudo -v
diff --git a/web_start.sh b/web_start.sh
new file mode 100755
index 00000000..c260e9d8
--- /dev/null
+++ b/web_start.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+function debian() {
+    hash apt-get &>/dev/null || (echo 'apt-get is missing.' && exit)
+    sudo apt-get -y install build-essential
+    sudo apt-get -y install git
+}
+
+function osx() {
+    hash gcc &>/dev/null
+    if [ $? -ne 0 ]
+    then
+	echo "gcc not found."
+	exit
+    fi
+    hash brew &>/dev/null && echo "brew found" || ruby -e "$(curl -fsSL https://raw.github.com/mxcl/homebrew/go)"
+    brew update
+    brew install git
+}
+
+case `uname` in
+    'Darwin')
+	osx
+	;;
+    'Linux')
+	debian
+        ;;
+esac
+
+git clone git@github.com:IvanMalison/dotfiles.git
+cd dotfiles