diff --git a/vimrc b/vimrc
index ecd69e3..5277b7f 100644
--- a/vimrc
+++ b/vimrc
@@ -41,7 +41,7 @@ Plugin 'vim-airline', {'name': 'airline'}
 Plugin 'chriskempson/base16-vim'
 
 Plugin 'scrooloose/syntastic.git'
-Plugin 'Townk/vim-autoclose'
+Plugin 'Raimondi/delimitMate'
 
 Plugin 'pangloss/vim-javascript'
 Plugin 'mustache/vim-mustache-handlebars'
diff --git a/zshenv b/zshenv
index c83c5da..8de06bd 100644
--- a/zshenv
+++ b/zshenv
@@ -20,6 +20,14 @@ BASE16_SCHEME="solarized"
 BASE16_SHELL="$HOME/.base16-shell/base16-$BASE16_SCHEME.dark.sh"
 [[ -s $BASE16_SHELL ]] && . $BASE16_SHELL
 
+DIST=$(lsb_release -si)
+case $DIST in
+    Arch )
+        # use python 2.7 by default
+        export PYTHON=python2
+        ;;
+esac
+
 # BW specific stuff
 JIRA_URL="https://jira.brandwatch.com"