making zshrc more flexible; tweaking html snippet
Merge branch 'master' of github.com:bundacia/homedir

Conflicts:
	.vim/bundle/vim-gitgutter