diff --git a/recipes/default/packages b/recipes/default/packages
index ec3654c..7a49baa 100644
--- a/recipes/default/packages
+++ b/recipes/default/packages
@@ -1,21 +1,34 @@
 #! /bin/bash
 
 sudo_package_update
-sudo_package 'tmux htop curl wget mercurial ctags tig pv jq fish mosh bash-completion'
+sudo_package 'tmux htop curl wget mercurial ctags tig pv jq fish mosh bash-completion doxygen'
 
 # Manager specific packages
 case "$PACKAGE_MANAGER" in
     "port")
-        sudo_package 'the_silver_searcher doxygen md5sha1sum gradle go bash apache-ant'
+        # Non-standard packages
+        sudo_package 'the_silver_searcher md5sha1sum gradle go bash apache-ant'
+        # Python packages
+        sudo_package 'python27 py27-pip py27-six python36 py36-pip py36-six'
+        sudo port select --set python python27
+        sudo port select --set python3 python36
+        sudo port select --set pip pip27
+        sudo port select --set tox tox27
+        sudo port select --set virtualenv virtualenv27
+        # Macvim with ruby and python support
         # sudo_package 'macvim +ruby +python27'
+        # Vim with ruby and python support
         sudo_package 'vim +ruby +python27'
-        sudo_package 'git-core +bash_completion'
+        # Newer version of git with completion
+        sudo_package 'git +bash_completion'
+        # Neovim with python plugins
+        sudo_package 'neovim py-neovim py27-neovim py36-neovim'
         ;;
     "apt-get")
         if [ -n "$(apt-cache policy silversearcher-ag)" ] ; then
             sudo_package 'silversearcher-ag'
         fi
-        sudo_package 'build-essential vim'
+        sudo_package 'build-essential vim golang-go'
         ;;
 esac
 
@@ -24,4 +37,4 @@ esac
 sudo gem install rake
 
 # install python packages
-sudo pip install -U pip ipython flake8 virtualenv
+sudo pip install -U pip ipython flake8 virtualenv tox