Added tcomment vim plugin, removed nerdcommenter
Oh-my-zsh stuff
Merge branch 'master' of https://github.com/DArtagan/dotfiles

Conflicts:
	.gitmodules
Merged in vimrc