updated some snippets and zshrc
Merge branch 'master' of github.com:benjamincharity/dot-files

Conflicts:
	vim/bundle/snipMate/snippets/sass.snippets
	vim/bundle/snipMate/snippets/scss.snippets