Merge branch 'master' of git://github.com/ElessarWebb/arch-config

Conflicts:
	dotfiles/.xinitrc
	dotfiles/.zshrc
In .zshrc: Added open command

Conflicts:
	dotfiles/.zshrc
In .vimrc: added handy shortcuts

Conflicts:
	dotfiles/.vimrc
In .vimrc: Added  as a keyword
Merge branch 'master' of github.com:ChocolateCookies/arch-config

Conflicts:
	dotfiles/.xinitrc
	dotfiles/.zshrc
Swapped workspaces Media and Docs

Conflicts:
	dotfiles/.i3/config
Changed vim command to v, so that regular vim is still available

Conflicts:
	dotfiles/.zshrc
Added vim-latex configs

Conflicts:
	dotfiles/.vim/ftplugin/tex.vim
Merge branch 'master' into adriaan

Conflicts:
	dotfiles/.i3/config
	dotfiles/.vim/ftplugin/tex.vim
	dotfiles/.zshrc