diff --git a/git/scripts/git-delete-branch b/git/git-delete-branch
similarity index 100%
rename from git/scripts/git-delete-branch
rename to git/git-delete-branch
diff --git a/git/scripts/git-github-init b/git/git-github-init
similarity index 100%
rename from git/scripts/git-github-init
rename to git/git-github-init
diff --git a/git/gitconfig b/gitconfig
similarity index 100%
rename from git/gitconfig
rename to gitconfig
diff --git a/nautilus-scripts/System/Restart Xmonad b/nautilus-scripts/System/Restart Xmonad
new file mode 100755
index 0000000..1c99ee7
--- /dev/null
+++ b/nautilus-scripts/System/Restart Xmonad	
@@ -0,0 +1,2 @@
+#!/bin/bash
+xmonad --replace &
diff --git a/osx-setup.sh b/osx-setup.sh
deleted file mode 100755
index a640cf7..0000000
--- a/osx-setup.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# TODO Installs Homebew
-brew install git ssh-copy-id bash-completion macvim multitail nmap tmux wget
-# TODO Installs Server stuff (nginx, php53, pear, redis, memcached, what have you)
-
-# Clears out the old .bash_profile
-if [ -f ~/.bash_profile ];
-then
-	rm ~/.bash_profile
-fi
-
-PWD=`pwd`
-
-# Adds paths and custom .bashrc
-echo "
-export PATH=\"$PWD/git:$PATH\"
-
-if [ -f $PWD/bashrc ] && ! shopt -oq posix;
-then
-	. $PWD/bashrc
-fi
-
-if [ -f `brew --prefix`/etc/bash_completion ];
-then
-	. `brew --prefix`/etc/bash_completion
-fi
-" >> ~/.bash_profile
-
-#./vim-setup.sh
diff --git a/setup.sh b/setup.sh
new file mode 100755
index 0000000..2d9a557
--- /dev/null
+++ b/setup.sh
@@ -0,0 +1,133 @@
+#!/bin/bash
+
+PWD=`pwd`
+
+# Copies .gitconfig
+if [ -f ~/.gitconfig ];
+then
+	rm ~/.gitconfig
+fi
+
+ln -s $PWD/gitconfig ~/.gitconfig
+
+if [ `uname` == 'Darwin' ];
+then
+	# TODO Installs Homebew
+	brew install git ssh-copy-id bash-completion macvim multitail nmap tmux wget
+	# TODO Installs Server stuff (nginx, php53, pear, redis, memcached, what have you)
+
+	# Clears out the old .bash_profile
+	if [ -f ~/.bash_profile ];
+	then
+		rm ~/.bash_profile
+	fi
+
+	# Adds paths and custom .bashrc
+	echo "
+export PATH=\"$PWD/git:$PATH\"
+
+if [ -f $PWD/bashrc ] && ! shopt -oq posix;
+then
+	. $PWD/bashrc
+fi
+
+if [ -f `brew --prefix`/etc/bash_completion ];
+then
+	. `brew --prefix`/etc/bash_completion
+fi
+" >> ~/.bash_profile
+
+else
+	# TODO Add prompts so I can run pieces of the set up
+
+	# Adds some third party repos
+	sudo add-apt-repository ppa:tiheum/equinox          # Faenza Icons
+	sudo add-apt-repository ppa:tualatrix/ppa           # Ubuntu Tweak
+	sudo add-apt-repository ppa:webupd8team/gnome3      # WebUpd8 Gnome Extensions
+	sudo add-apt-repository ppa:otto-kesselgulasch/gimp # Gimp 2.8
+
+	# Updates the package list
+	sudo apt-get update
+
+	# Gets rid of some bullshit packages
+	#sudo apt-get --purge autoremove appmenu-gtk appmenu-gtk3 zeitgeist gwibber gnome-screensaver banshee
+
+	# Installs CLI apps
+	sudo apt-get install vim ssh multitail htop iotop tmux
+
+	# Installs desktop environment
+	sudo apt-get install gnome-shell gnome-tweak-tool faenza-icon-theme network-manager-openconnect-gnome gnome-sushi gnome-shell-extensions-mediaplayer gnome-shell-extensions-noa11y gnome-shell-classic-systray gnome-shell-message-notifier gnome-shell-extension-notesearch
+
+	# Installs non-CLI apps
+	sudo apt-get install gnome-agave gimp inkscape tomboy rhythmbox chromium-browser shutter ubuntu-tweak vim-gnome
+
+	# Installs my dev stack
+	sudo apt-get install git-core ruby1.8-dev nginx apache2 php5 php5-cgi php5-cli php-pear php5-suhosin psmisc spawn-fcgi mysql-server php5-mysql redis-server memcached php5-memcache php5-memcached php5-gd php5-curl php5-imagick exim4-daemon-light
+
+	# TODO Installs my server stack
+
+	# Configures some stuff
+	sudo a2enmod expires rewrite ssl
+	sudo service apache2 restart
+
+	# Clears out the old .bashrc
+	if [ -f ~/.bashrc ];
+	then
+		rm ~/.bashrc
+	fi
+
+	# Grabs the skeleton .bashrc
+	cp /etc/skel/.bashrc ~/.bashrc
+
+	# Adds paths and custom .bashrc
+	echo "
+export PATH=\"$PWD/git:$PATH\"
+
+if [ -f $PWD/bashrc ] && ! shopt -oq posix; then
+	. $PWD/bashrc
+fi" >> ~/.bashrc
+
+	# Removes the existing scripts
+	if [ -d ~/.gnome2/nautilus-scripts ];
+	then
+		rm ~/.gnome2/nautilus-scripts -rf
+	fi
+
+	# Symlinks back to our scripts
+	ln -s $PWD/nautilus-scripts ~/.gnome2/nautilus-scripts
+fi
+
+# Copies .vimrc
+if [ -f ~/.vimrc ];
+then
+	rm ~/.vimrc
+fi
+
+ln -s $PWD/vimrc ~/.vimrc
+
+# Pulls down and installs vim plugins
+DOTVIM=~/.vim
+
+if [ -d $DOTVIM ];
+then
+	rm -r $DOTVIM
+fi
+
+mkdir $DOTVIM
+
+OWNERS=( "ervandew" "msanders"     "nvie"            "scrooloose" "scrooloose" "tpope"        "vim-scripts" )
+REPOS=(  "supertab" "snipmate.vim" "vim-togglemouse" "nerdtree"   "syntastic"  "vim-fugitive" "Command-T"   )
+
+for (( i = 0 ; i < ${#OWNERS[@]} ; i++ ))
+do
+	git clone git://github.com/${OWNERS[$i]}/${REPOS[$i]}.git /tmp/${REPOS[$i]}
+	cp -R /tmp/${REPOS[$i]}/* $DOTVIM
+	rm -rf /tmp/${REPOS[$i]}
+done
+
+# Finish up Command-T installation
+cd $DOTVIM/ruby/command-t
+ruby extconf.rb
+make
+
+echo; echo "SETUP COMPLETE!!~!"
diff --git a/symlink-nginx-conf b/symlink-nginx-conf
deleted file mode 100755
index 86ef385..0000000
--- a/symlink-nginx-conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-sudo rm    /etc/nginx/sites-enabled/$1         /etc/nginx/sites-available/$1
-sudo ln -s /home/josh/Sites/$1/conf/nginx.conf /etc/nginx/sites-available/$1
-sudo ln -s /etc/nginx/sites-available/$1       /etc/nginx/sites-enabled/$1
-sudo /etc/init.d/nginx reload
diff --git a/ubuntu-setup.sh b/ubuntu-setup.sh
deleted file mode 100755
index 026f5fc..0000000
--- a/ubuntu-setup.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-# TODO Add prompts so I can run pieces of the set up
-
-# Adds some third party repos
-sudo add-apt-repository ppa:tiheum/equinox          # Faenza Icons
-sudo add-apt-repository ppa:tualatrix/ppa           # Ubuntu Tweak
-sudo add-apt-repository ppa:webupd8team/gnome3      # WebUpd8 Gnome Extensions
-sudo add-apt-repository ppa:otto-kesselgulasch/gimp # Gimp 2.8
-
-# Updates the package list
-sudo apt-get update
-
-# Gets rid of some bullshit packages
-#sudo apt-get --purge autoremove appmenu-gtk appmenu-gtk3 zeitgeist gwibber gnome-screensaver banshee
-
-# Installs CLI apps
-sudo apt-get install vim ssh multitail htop iotop tmux
-
-# Installs desktop environment
-sudo apt-get install gnome-shell gnome-tweak-tool faenza-icon-theme network-manager-openconnect-gnome gnome-sushi gnome-shell-extensions-mediaplayer gnome-shell-extensions-noa11y gnome-shell-classic-systray gnome-shell-message-notifier gnome-shell-extension-notesearch
-
-# Installs non-CLI apps
-sudo apt-get install gnome-agave gimp inkscape tomboy rhythmbox chromium-browser shutter ubuntu-tweak vim-gnome
-
-gsettings set com.github.charkins.notesearch app Tomboy
-# gsettings set com.github.charkins.notesearch app Gnote
-
-# Installs my dev stack
-sudo apt-get install git-core ruby1.8-dev nginx apache2 php5 php5-cgi php5-cli php-pear php5-suhosin psmisc spawn-fcgi mysql-server php5-mysql redis-server memcached php5-memcache php5-memcached php5-gd php5-curl php5-imagick exim4-daemon-light
-
-# TODO Installs my server stack
-
-# Configures some stuff
-sudo a2enmod expires rewrite ssl
-sudo service apache2 restart
-
-# Clears out the old .bashrc
-if [ -f ~/.bashrc ];
-then
-	rm ~/.bashrc
-fi
-
-# Grabs the skeleton .bashrc
-cp /etc/skel/.bashrc ~/.bashrc
-
-PWD=`pwd`
-
-# Adds paths and custom .bashrc
-echo "
-export PATH=\"$PWD/git:$PATH\"
-
-if [ -f $PWD/bashrc ] && ! shopt -oq posix; then
-	. $PWD/bashrc
-fi" >> ~/.bashrc
-
-# Removes the existing scripts
-if [ -d ~/.gnome2/nautilus-scripts ];
-then
-	rm ~/.gnome2/nautilus-scripts -rf
-fi
-
-# Symlinks back to our scripts
-ln -s $PWD/nautilus-scripts ~/.gnome2/nautilus-scripts
-
-./vim-setup.sh
-
-echo; echo "SETUP COMPLETE!!~!"
-echo; echo "For further enhancement, do this: http://www.omgubuntu.co.uk/2011/10/use-adwaita-dark-as-your-system-theme/"
diff --git a/vim/vim-setup.sh b/vim/vim-setup.sh
deleted file mode 100755
index 37f4558..0000000
--- a/vim/vim-setup.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-PWD=`pwd`
-
-# Copies .vimrc
-if [ -f ~/.vimrc ];
-then
-	rm ~/.vimrc
-fi
-
-cp $PWD/vimrc ~/.vimrc
-
-# Pulls down and installs vim plugins
-DOTVIM=~/.vim
-
-if [ -d $DOTVIM ];
-then
-	rm -r $DOTVIM
-fi
-
-mkdir $DOTVIM
-
-OWNERS=( "ervandew" "msanders"     "nvie"            "scrooloose" "scrooloose" "tpope"        "vim-scripts" )
-REPOS=(  "supertab" "snipmate.vim" "vim-togglemouse" "nerdtree"   "syntastic"  "vim-fugitive" "Command-T"   )
-
-for (( i = 0 ; i < ${#OWNERS[@]} ; i++ ))
-do
-	git clone git://github.com/${OWNERS[$i]}/${REPOS[$i]}.git /tmp/${REPOS[$i]}
-	cp -R /tmp/${REPOS[$i]}/* $DOTVIM
-	rm -rf /tmp/${REPOS[$i]}
-done
-
-# Finish up Command-T installation
-cd $DOTVIM/ruby/command-t
-ruby extconf.rb
-make
diff --git a/vim/vimrc b/vimrc
similarity index 98%
rename from vim/vimrc
rename to vimrc
index a1a2ca0..22b3dc3 100644
--- a/vim/vimrc
+++ b/vimrc
@@ -1,5 +1,8 @@
 set nocompatible
 
+" Supposed to fix https://github.com/millermedeiros/vim-statline/issues/6
+let g:statline_syntastic = 0
+
 " Stole some shit from these:
 "     https://raw.github.com/scrooloose/vimfiles/master/vimrc
 "     http://amix.dk/vim/vimrc.html