diff --git a/.gitmodules b/.gitmodules
index 8877b28..240cb2d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,9 +16,3 @@
 [submodule "bin/rbenv-git"]
 	path = bin/rbenv-git
 	url = git://github.com/sstephenson/rbenv.git
-[submodule "rbenv/plugins/rbenv-readline"]
-	path = rbenv/plugins/rbenv-readline
-	url = git://github.com/tpope/rbenv-readline.git
-[submodule "rbenv/plugins/rbenv-openssl"]
-	path = rbenv/plugins/rbenv-openssl
-	url = git://github.com/DevelopStuff/rbenv-openssl.git
diff --git a/brew b/bootstrap-mac.sh
similarity index 92%
rename from brew
rename to bootstrap-mac.sh
index 4fa3090..4589421 100644
--- a/brew
+++ b/bootstrap-mac.sh
@@ -24,9 +24,10 @@ brew install ffind
 brew install node
 brew install chruby
 brew install ruby-install
+brew install msmtp
 brew install mutt
-brew install mosh
 brew install isync
+brew install mosh
 brew install haskell-platform
 brew install brew-cask
 brew cask install rdio
@@ -54,6 +55,7 @@ brew cleanup
 # Ruby TODO -- set up chruby, ruby-install some stuff
 # Gems TODO
 # Node packages TODO
+# Cabal packages TODO
 
 # Change to fish shell
 # TODO check if it's already in there first!!
@@ -61,9 +63,7 @@ echo "/usr/local/bin/fish" | sudo tee -a /etc/shells
 chsh -s /usr/local/bin/fish dustinswan
 
 # Symlinks
-rm ~/.vimrc; ln -s ~/dotfiles/vimrc ~/.vimrc
-rm -rf ~/.vim; ln -s ~/dotfiles/vim ~/.vim
-rm ~/.ackrc; ln -s ~/dotfiles/ackrc ~/.ackrc
+bash ~/dotfiles/symlinks.sh
 
 # Sane OS X defaults
 bash ~/dotfiles/osx
diff --git a/fish/config.fish b/config.fish
similarity index 100%
rename from fish/config.fish
rename to config.fish
diff --git a/osx b/osx
index 7fe9d18..9170a8e 100644
--- a/osx
+++ b/osx
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-
 # ~/.osx — http://mths.be/osx
 
 # Ask for the administrator password upfront
diff --git a/rbenv/plugins/rbenv-openssl b/rbenv/plugins/rbenv-openssl
deleted file mode 160000
index ae73a0b..0000000
--- a/rbenv/plugins/rbenv-openssl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ae73a0bd18d197f2319a6a4e23c493d3e1398f87
diff --git a/rbenv/plugins/rbenv-readline b/rbenv/plugins/rbenv-readline
deleted file mode 160000
index 65dced7..0000000
--- a/rbenv/plugins/rbenv-readline
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 65dced7119dd568ceee69c4933379586e9d8e197
diff --git a/symlinks.sh b/symlinks.sh
new file mode 100644
index 0000000..4596e6c
--- /dev/null
+++ b/symlinks.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+rm ~/.ackrc; ln -s ~/dotfiles/ackrc ~/.ackrc
+mkdir -p ~/.config/fish; ln -s ~/dotfiles/config.fish ~/.config/fish/config.fish
+rm ~/.gemrc; ln -s ~/dotfiles/gemrc ~/.gemrc
+mkdir ~/.ghc; rm ~/.ghc/ghci.conf; ln -s ~/dotfiles/ghci.conf ~/.ghc/ghci.conf
+rm ~/.gitconfig; ln -s ~/dotfiles/gitconfig ~/.gitconfig
+rm ~/.mbsyncrc; ln -s ~/dotfiles/mbsyncrc ~/.mbsyncrc
+rm ~/.msmtprc; ln -s ~/dotfiles/msmtprc ~/.msmtprc
+rm ~/.ruby-version; ln -s ~/dotfiles/ruby-version ~/.ruby-version
+rm ~/.tmux.conf; ln -s ~/dotfiles/tmux.conf ~/.tmux.conf
+rm ~/.vimrc; ln -s ~/dotfiles/vimrc ~/.vimrc
+rm -rf ~/.vim; ln -s ~/dotfiles/vim ~/.vim