updated global gitignore
updated for mac
Merge branch 'master' of github.com:stphndemos/dotfiles
cleaning up
Merge branch 'master' of github.com:stphndemos/dotfiles

Conflicts:
	.zshrc