Moved from bash_mine to zshrc_local

Conflicts:
	zshrc
Updated rust.vim files
Merge branch 'master' into xfce4
Trying submodules
Switched to submodules, and nerdtree shortcut
Merge branch 'xfce4' of github.com:shaladdle/dotfiles into xfce4

Conflicts:
	vim/bundle/nerdtree
Moved oh-my-zsh to zsh_local since machines have different paths