Merge branch 'master' into debian
Updates vimrc
Merge branch 'master' into debian
Merge branch 'debian' of github.com:kevincolyar/dotfiles into debian
Fixes remote tmux+ssh
Removes ssh settings
Latest zsh settings
Updates oh-my-zsh theme
Latest vim updates
Merge branch 'debian' into debian-dreamhost

Conflicts:
	zshrc
Merge branch 'debian' into debian-dreamhost