diff --git a/rake/homebrew.rake b/rake/homebrew.rake
index 7c054716..03ccda4c 100644
--- a/rake/homebrew.rake
+++ b/rake/homebrew.rake
@@ -41,6 +41,8 @@ namespace :homebrew do
             launchbar
             java
         }.each { |app| Homebrew.install_cask app }
+
+        echo "Homebrew is installed. Moving on."
     end
 
     task :update => :install do
diff --git a/rake/osx.rake b/rake/osx.rake
index 8a64c9d1..e916e9b0 100644
--- a/rake/osx.rake
+++ b/rake/osx.rake
@@ -2,6 +2,11 @@
 require_relative 'lib/output'
 
 task :osx do
+    if `defaults read com.apple.finder _FXShowPosixPathInTitle | grep 1`
+        echo 'OSX settings already applied!'
+        next
+    end
+
     echo "Applying OSX settings"
     sh 'chflags nohidden "${HOME}/Library"'
     sh 'defaults write NSGlobalDomain KeyRepeat -int 0'
diff --git a/rake/vim.rake b/rake/vim.rake
index 57ef50a0..0a5ef82d 100644
--- a/rake/vim.rake
+++ b/rake/vim.rake
@@ -3,7 +3,7 @@ require_relative "lib/output"
 require_relative "lib/homebrew"
 
 desc "Ensure vim/macvim is installed and up to date"
-task :vim => 'vim:update'
+task :vim
 
 namespace :vim do
 
@@ -14,11 +14,6 @@ namespace :vim do
         github('hlissner/vim', '~/.vim') unless Dir.exists?(File.expand_path("~/.vim"))
     end
 
-    task :update => 'vim:install' do
-        echo "Updating vim..."
-        Homebrew.update *["lua", "luajit", "vim", "macvim"]
-    end
-
     desc "Remove vim"
     task :remove do 
         echo "Uninstalling Homebrew"