diff --git a/.gitmodules b/.gitmodules
index 7f79dcc..41a7734 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -58,3 +58,6 @@
 [submodule ".vim/bundle/calendar-vim"]
 	path = .vim/bundle/calendar-vim
 	url = https://github.com/mattn/calendar-vim
+[submodule ".vim/bundle/vim-puppet"]
+	path = .vim/bundle/vim-puppet
+	url = https://github.com/rodjek/vim-puppet.git
diff --git a/.puppet/console.pp b/.puppet/console.pp
new file mode 100644
index 0000000..67faf27
--- /dev/null
+++ b/.puppet/console.pp
@@ -0,0 +1,6 @@
+$enhancers = [ "tmux", "strace", "sudo" ]
+
+package { 
+  $enhancers: 
+    ensure => "installed" 
+}
diff --git a/.puppet/editor.pp b/.puppet/editor.pp
new file mode 100644
index 0000000..f8aa15d
--- /dev/null
+++ b/.puppet/editor.pp
@@ -0,0 +1,6 @@
+$packages = [ "vim-gnome", "ctags"]
+
+package { 
+  $packages: 
+    ensure => "installed" 
+}
diff --git a/.puppet/install-linux.pp b/.puppet/install-linux.pp
new file mode 100644
index 0000000..8a8d930
--- /dev/null
+++ b/.puppet/install-linux.pp
@@ -0,0 +1,3 @@
+import "console.pp"
+import "editor.pp"
+import "x11.pp"
diff --git a/.puppet/python.pp b/.puppet/python.pp
new file mode 100644
index 0000000..6261326
--- /dev/null
+++ b/.puppet/python.pp
@@ -0,0 +1,15 @@
+$packages = [ "python-pip"]
+
+package { 
+  $packages: 
+    ensure => "installed" 
+}
+
+$pip_packages = ["flake8", "tornado"]
+
+package {
+  $pip_packages : 
+    ensure => "installed",
+    provider => "pip",
+  
+}
diff --git a/.puppet/x11.pp b/.puppet/x11.pp
new file mode 100644
index 0000000..6d9d23e
--- /dev/null
+++ b/.puppet/x11.pp
@@ -0,0 +1,6 @@
+$packages = [ "awesome", "awesome-extra", "feh"]
+
+package { 
+  $packages: 
+    ensure => "installed" 
+}
diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive
index 618d884..4c7e649 160000
--- a/.vim/bundle/vim-fugitive
+++ b/.vim/bundle/vim-fugitive
@@ -1 +1 @@
-Subproject commit 618d884562f2b99fa62e3fb90e3531bf17396efa
+Subproject commit 4c7e649efba289df0e7e8bb9abfa37f95b28f8ed
diff --git a/.vim/bundle/vim-puppet b/.vim/bundle/vim-puppet
new file mode 160000
index 0000000..82a88e7
--- /dev/null
+++ b/.vim/bundle/vim-puppet
@@ -0,0 +1 @@
+Subproject commit 82a88e75e1d2ea392176debb5e3b63dadc6a8339