Tidying up comments
Removed some functions
Merge branch 'master' of github.com:rjshade/dotfiles

Conflicts:
	vim/vimrc
	zsh/zsh.d/3_functions.zsh