Update zsh-autosuggestions and zsh-syntax-highlighting

And also make them load as a oh-my-zsh plugin.

.gitmodules

@@ -11,7 +11,7 @@
 	path = shell/tmux/tmuxifier
 	url = git@github.com:jimeh/tmuxifier.git
 [submodule "shell/zsh/zsh-syntax-highlighting"]
-	path = shell/zsh/zsh-syntax-highlighting
+	path = shell/zsh/custom/plugins/zsh-syntax-highlighting
 	url = git://github.com/zsh-users/zsh-syntax-highlighting.git
 [submodule "shell/bash/git-aware-prompt"]
 	path = shell/bash/git-aware-prompt
@@ -20,5 +20,5 @@
 	path = tmux/themes
 	url = git@github.com:jimeh/tmux-themepack.git
 [submodule "shell/zsh/zsh-autosuggestions"]
-	path = shell/zsh/zsh-autosuggestions
+	path = shell/zsh/custom/plugins/zsh-autosuggestions
 	url = git@github.com:tarruda/zsh-autosuggestions.git

shell/zshrc.sh

@@ -50,6 +50,8 @@ plugins=( \
   ruby \
   thor \
   vagrant \
+  zsh-autosuggestions \
+  zsh-syntax-highlighting \
 )
 
 source "$ZSH/oh-my-zsh.sh"
@@ -72,29 +74,9 @@ unalias shotgun
 # Cause I hit emacs shorts too much
 bindkey -s "\C-x\C-f" "cd "
 
-
-#
-# Z-Shell Command Highlighting
-#
-
-# Highlighters
+# Configure zsh-syntax-highlighting
 ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets)
 
-source "$DOTZSH/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
-
-
-#
-# Z-Shell Autosuggestions
-#
-
-source "$DOTZSH/zsh-autosuggestions/autosuggestions.zsh"
-
-# Enable autosuggestions automatically
-zle-line-init() {
-  zle autosuggest-start
-}
-zle -N zle-line-init
-
 # use ctrl+t to toggle autosuggestions(hopefully this wont be needed as
 # zsh-autosuggestions is designed to be unobtrusive)
 bindkey '^T' autosuggest-toggle