diff --git a/.gitmodules b/.gitmodules
index ca293f5..e3965a2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -124,3 +124,6 @@
 [submodule "home/.vim/bundle/vim-ember-hbs"]
 	path = home/.vim/bundle/vim-ember-hbs
 	url = https://github.com/joukevandermaas/vim-ember-hbs.git
+[submodule "home/.pyenv"]
+	path = home/.pyenv
+	url = https://github.com/pyenv/pyenv.git
diff --git a/home/.bin-services/git_repository.rb b/home/.bin-services/git_repository.rb
index a54e85f..24329bc 100644
--- a/home/.bin-services/git_repository.rb
+++ b/home/.bin-services/git_repository.rb
@@ -19,10 +19,10 @@ def validate_for_hotfix!
       raise GitError, "Please pull --rebase master and develop"
     end
 
-    puts "Checking for existing hotfix branch"
-    if has_existing_branch_name?("hotfix")
-      raise GitFlowError, "You already have an existing hotfix branch"
-    end
+    #puts "Checking for existing hotfix branch"
+    #if has_existing_branch_name?("hotfix")
+    #  raise GitFlowError, "You already have an existing hotfix branch"
+    #end
   end
 
   def validate_for_feature!
diff --git a/home/.pyenv b/home/.pyenv
new file mode 160000
index 0000000..5603eb5
--- /dev/null
+++ b/home/.pyenv
@@ -0,0 +1 @@
+Subproject commit 5603eb51c93bf053f2b03e3d80a9d0be62dcdeec
diff --git a/home/.thymerc b/home/.thymerc
index 4476953..b35277b 100644
--- a/home/.thymerc
+++ b/home/.thymerc
@@ -11,27 +11,27 @@ option :t, :today, 'open today sheet' do
 end
 
 option :p, :break, 'start a break' do
-  run
+  @run = true
 end
 
 option :b, :break, 'start a break' do
   set :timer, 5*60
-  run
+  @run = true
 end
 
 option :l, :long_break, 'start a long break' do
   set :timer, 10*60
-  run
+  @run = true
 end
 
 option :s, 'seconds num', 'run with custom seconds' do |num|
   @timer = num.to_i
-  run
+  @run = true
 end
 
 option :m, 'minutes num', 'run with custom minutes' do |num|
   @timer = num.to_i * 60
-  run
+  @run = true
 end
 
 option :r, :reset, 'reset status bar' do
diff --git a/home/.zshenv b/home/.zshenv
index e69de29..552d4c5 100644
--- a/home/.zshenv
+++ b/home/.zshenv
@@ -0,0 +1,6 @@
+export PYENV_ROOT=~/.pyenv
+export PATH=$PYENV_ROOT/bin:$PATH
+
+if command -v pyenv 1>/dev/null 2>&1; then
+  eval "$(pyenv init -)"
+fi