diff --git a/.gitmodules b/.gitmodules
index 95df6c7..716cf32 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,9 @@
 [submodule "vim/pack/normal/start/vim-go"]
 	path = vim/pack/normal/start/vim-go
 	url = https://github.com/fatih/vim-go.git
+[submodule "vim/pack/normal/start/vim-toml"]
+	path = vim/pack/normal/start/vim-toml
+	url = https://github.com/cespare/vim-toml.git
 [submodule "zsh/zsh-syntax-highlighting"]
 	path = zsh/zsh-syntax-highlighting
 	url = https://github.com/zsh-users/zsh-syntax-highlighting
diff --git a/vim/pack/normal/start/vim-toml b/vim/pack/normal/start/vim-toml
new file mode 160000
index 0000000..2c8983c
--- /dev/null
+++ b/vim/pack/normal/start/vim-toml
@@ -0,0 +1 @@
+Subproject commit 2c8983cc391287e5e26e015c3ab9c38de9f9b759
diff --git a/zshrc b/zshrc
index 6370f46..5d88361 100644
--- a/zshrc
+++ b/zshrc
@@ -84,6 +84,12 @@ if [[ $OSTYPE == darwin* ]]; then
     eval $($BREW_PREFIX/bin/brew shellenv)
   fi
 
+  # If we have it available, permit MacPorts.
+  if [ -f /opt/local/bin/port ]; then
+    export PATH="/opt/local/bin:/opt/local/sbin:$PATH"
+    export MANPATH="/opt/local/share/man:$MANPATH"
+  fi
+
   # Under Darwin, we also want iTerm2 integration if possible.
   if [ -f ${HOME}/.iterm2_shell_integration.zsh ]; then
     source "${HOME}/.iterm2_shell_integration.zsh"
@@ -127,11 +133,6 @@ if [ -d /Library/Developer/Toolchains/swift-latest.xctoolchain ]; then
   export PATH="/Library/Developer/Toolchains/swift-latest.xctoolchain/usr/bin:$PATH"
 fi
 
-# Support mint (https://github.com/yonaskolb/Mint)
-if [ -d $HOME/.mint/bin ]; then
-  export PATH="$HOME/.mint/bin:$PATH"
-fi
-
 # RVM must be last.
 if [ -d $HOME/.rvm ]; then
   PATH=${PATH}:$HOME/.rvm/bin