diff --git a/zsh/aliases b/zsh/aliases
index 6b4fb3a0..416b540b 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -39,10 +39,8 @@ alias gl='git ll'
 alias gf='git f'
 alias gg='git grep -Ii'
 alias gt='git tag'
-
 alias gd='git difftool'
 alias gdl="git ll -1"
-
 alias gr='git reset'
 alias gbr='git br'
 
@@ -52,7 +50,4 @@ if command_exists "brew"; then
     alias brewp='cd `brew --prefix`'
 fi
 
-# Laravel ######################
-alias artisan='php artisan'
-alias bob='php artisan bob::build'
-
+# vim:set ft=zsh:
diff --git a/zsh/completion b/zsh/completion
index d9ce93d9..07922378 100644
--- a/zsh/completion
+++ b/zsh/completion
@@ -1,2 +1,4 @@
 # Add tab completion for SSH hostnames based on ~/.ssh/config, ignoring wildcards
 [ -e "$HOME/.ssh/config" ] && complete -o "default" -o "nospace" -W "$(grep "^Host" ~/.ssh/config | grep -v "[?*]" | cut -d " " -f2)" scp sftp ssh
+
+# vim:set ft=zsh:
diff --git a/zsh/config b/zsh/config
index 942868c6..9202110e 100644
--- a/zsh/config
+++ b/zsh/config
@@ -41,3 +41,5 @@ export EDITOR=vim
 export RUBYOPT=rubygems
 
 COMPLETION_WAITING_DOTS="true"
+
+# vim:set ft=zsh:
diff --git a/zsh/functions b/zsh/functions
index 71b7c1b3..e9da334c 100644
--- a/zsh/functions
+++ b/zsh/functions
@@ -29,3 +29,5 @@ function extract {
 source ~/.dotfiles/zsh/lib/util
 source ~/.dotfiles/zsh/lib/output
 source ~/.dotfiles/zsh/lib/os
+
+# vim:set ft=zsh:
diff --git a/zsh/lib/os b/zsh/lib/os
index 2b95c1a9..bf369421 100644
--- a/zsh/lib/os
+++ b/zsh/lib/os
@@ -40,3 +40,4 @@ elif is_deb; then
     
 fi
 
+# vim:set ft=zsh:
diff --git a/zsh/lib/util b/zsh/lib/util
index 9fe2ffff..5a942f58 100644
--- a/zsh/lib/util
+++ b/zsh/lib/util
@@ -14,3 +14,5 @@ function do_link {
     fi
     ln -sf "$1" "$2"
 }
+
+# vim:set ft=zsh:
diff --git a/zsh/paths b/zsh/paths
index 7c0e2601..6817d3f3 100644
--- a/zsh/paths
+++ b/zsh/paths
@@ -15,3 +15,5 @@ PATH=$HOME/.rvm/bin:$PATH
 if [ -d ~/.dotfiles ]; then
     PATH=~/.dotfiles/bin:$PATH
 fi
+
+# vim:set ft=zsh:
diff --git a/zsh/prompt b/zsh/prompt
index 444846c1..38fef200 100644
--- a/zsh/prompt
+++ b/zsh/prompt
@@ -48,3 +48,5 @@ rprompt() {
 
 PROMPT="$(prompt)"
 RPROMPT="$(rprompt)"
+
+# vim:set ft=zsh:
diff --git a/zsh/welcome b/zsh/welcome
index 30fd8e18..6dc37254 100644
--- a/zsh/welcome
+++ b/zsh/welcome
@@ -1 +1,3 @@
 # Nothing here yet
+
+# vim:set ft=zsh: