diff --git a/.config/Code/User/keybindings.json b/config/Code/User/keybindings.json
similarity index 100%
rename from .config/Code/User/keybindings.json
rename to config/Code/User/keybindings.json
diff --git a/.config/Code/User/settings.json b/config/Code/User/settings.json
similarity index 100%
rename from .config/Code/User/settings.json
rename to config/Code/User/settings.json
diff --git a/.config/compton/compton.conf b/config/compton/compton.conf
similarity index 100%
rename from .config/compton/compton.conf
rename to config/compton/compton.conf
diff --git a/.config/dunst/dunstrc b/config/dunst/dunstrc
similarity index 100%
rename from .config/dunst/dunstrc
rename to config/dunst/dunstrc
diff --git a/.config/i3/config b/config/i3/config
similarity index 100%
rename from .config/i3/config
rename to config/i3/config
diff --git a/.config/i3/polybar.sh b/config/i3/polybar.sh
similarity index 100%
rename from .config/i3/polybar.sh
rename to config/i3/polybar.sh
diff --git a/.config/nigtrogen/bg-saved.cfg b/config/nigtrogen/bg-saved.cfg
similarity index 100%
rename from .config/nigtrogen/bg-saved.cfg
rename to config/nigtrogen/bg-saved.cfg
diff --git a/.config/nigtrogen/nitrogen.cfg b/config/nigtrogen/nitrogen.cfg
similarity index 100%
rename from .config/nigtrogen/nitrogen.cfg
rename to config/nigtrogen/nitrogen.cfg
diff --git a/.config/polybar/config b/config/polybar/config
similarity index 100%
rename from .config/polybar/config
rename to config/polybar/config
diff --git a/.config/terminator/config b/config/terminator/config
similarity index 100%
rename from .config/terminator/config
rename to config/terminator/config
diff --git a/install/debian.sh b/install/debian.sh
index 231fb9c..4f9a8cb 100755
--- a/install/debian.sh
+++ b/install/debian.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-if [ ! -d  ${dest}/.config ]; then
+if [ ! -d  ${dest}/config ]; then
   mkdir -p ${dest}/.config/
-  cp -R ${source}/.config/ ${dest}/.config/
+  cp -R ${source}/config/ ${dest}/.config/
 fi
 
 apt-get update && apt-get install -y \
@@ -13,6 +13,7 @@ apt-get update && apt-get install -y \
   cmake-data \
   compton \
   curl \
+  git \
   i3-wm \
   nitrogen \
   python \
@@ -41,10 +42,9 @@ apt-get update && apt-get install -y \
   snap \
   pkg-config \
   python-xcbgen \
-  xcb-proto \
-  git;
+  xcb-proto;
 
-snap install slack
+snap install slack;
 
 curl https://raw.githubusercontent.com/creationix/nvm/v0.25.0/install.sh | bash
 
@@ -57,14 +57,13 @@ cd ./polybar
 cd ..
 
 
+# install vim with all of the necessary features
 git clone https://github.com/vim/vim vim
 cd ./vim
 
 ./configure --with-features=huge \
-  --enable-clipboard \
-  --enable-multibyte  \
+  --enable-multibyte \
   --enable-rubyinterp=yes \
-  --enable-pythoninterp=yes \
   --enable-python3interp=yes \
   --enable-perlinterp=yes \
   --enable-luainterp=yes \
diff --git a/rakefile b/rakefile
index a743739..1898357 100644
--- a/rakefile
+++ b/rakefile
@@ -5,10 +5,9 @@ vimFolder = "tools/vim"
 bundles_dir = File.join("#{vimFolder}/bundle/")
 pluginsFile = File.join("#{vimFolder}/plugins.txt")
 
-CLOBBER.include "#{bundles_dir}"
 CLEAN.include "#{bundles_dir}"
 
-task :default => ['vim:reinstall']
+task :default => ['clean', 'vim:reinstall']
 
 
 namespace :vim do
@@ -21,7 +20,7 @@ namespace :vim do
     puts "Loading #{lines.length} plugins..."
     lines.each { |source|
       if source[0] != "#" then
-        loadTask = Rake::Task['vim:loadPlugin']
+        loadTask = Rake::Task['vim:downloadPlugin']
         loadTask.invoke source.sub "\n", ''
         loadTask.reenable()
       end
@@ -29,8 +28,8 @@ namespace :vim do
     puts "Plugins installed!"
   end
 
-  desc 'Loads a vim plugin from a git repo.'
-  task :loadPlugin, [:source] => "#{bundles_dir}" do |t, args|
+  desc 'downloads a vim plugin from a git repo.'
+  task :downloadPlugin, [:source] => "#{bundles_dir}" do |t, args|
     raise "Must specify git repo to pull from." unless args.source not(nil)
     dir = gitName args.source
     puts "Installing #{dir}...."
@@ -42,11 +41,11 @@ namespace :vim do
   end
 
 
-  desc "installs a new plugin and adds it to #{vimFolder}/plugins.txt"
+  desc "downloads a new plugin and adds it to #{vimFolder}/plugins.txt"
   task :install, [:sourceName] do |t, args|
     raise "Must specify git repo to pull from." unless args.sourceName not(nil)
     source = "git://github.com/#{args.sourceName}.git"
-    Rake::Task['vim:loadPlugin'].invoke source
+    Rake::Task['vim:downloadPlugin'].invoke source
     puts "Adding to #{vimFolder}/plugins.txt"
     File.open pluginsFile, 'a' do |file|
       file.puts "#{source}\n"