diff --git a/dotfiles/config/nvim/init.vim b/dotfiles/config/nvim/init.vim
index da60bb9..b734726 100644
--- a/dotfiles/config/nvim/init.vim
+++ b/dotfiles/config/nvim/init.vim
@@ -174,6 +174,14 @@ let g:syntastic_javascript_jsxhint_exec = 'eslint'
 " Color customizations
 " let g:indentLine_color_term=###
 
+" Python-mode settings
+
+" disable pymode folding
+let g:pymode_folding = 0
+
+" set pydoc key
+let g:pymode_doc_key = 'K'
+
 " Merlin for OCaml
 let g:opamshare = substitute(system('opam config var share'),'\n$','','''')
 execute "set rtp+=" . g:opamshare . "/merlin/vim"
diff --git a/ubuntu/installer.sh b/ubuntu/installer.sh
index 086fc57..5b49c6b 100644
--- a/ubuntu/installer.sh
+++ b/ubuntu/installer.sh
@@ -16,8 +16,11 @@ echo "Running pre-setup..."
 sudo add-apt-repository ppa:neovim-ppa/unstable
 sudo apt-add-repository -y "deb http://repository.spotify.com stable non-free"
 sudo apt-add-repository -y ppa:richardgv/compton
+sudo apt-add-respository -y "http://apt.postgresql.org/pub/repos/apt/"
 sudo apt-add-repository -y ppa:webupd8team/java
 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D2C19886
+wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \
+  sudo apt-key add -
 sudo dpkg --add-architecture i386
 sudo add-apt-repository ppa:wine/wine-builds
 sudo echo "deb http://cran.rstudio.com/bin/linux/ubuntu xenial/" | sudo tee -a /etc/apt/sources.list
@@ -75,6 +78,7 @@ sudo gdebi -n rstudio-0.99.896-amd64.deb
 rm rstudio-0.99.896-amd64.deb
 sudo apt-get -qq -y install r-cran-rcpparmadillo
 sudo apt-get -qq -y install r-cran-rgl
+sudo apt-get -qq -y install libpq-dev
 
 # Editors
 echo "Installing editors..."
@@ -84,6 +88,10 @@ sudo apt-get -qq -y install neovim
 echo "Installing python tools for neovim..."
 sudo pip install neovim
 
+# Databases
+echo "Installing databases..."
+sudo apt-get -qq -y postgresql-9.5
+
 # Terminals
 echo "Installing terminal..."
 sudo apt-get -qq -y rxvt-unicode