update for OSX
Merge branch 'master' of https://github.com/ser1zw/dotfiles

Conflicts:
	files/.emacs.d/config/00-init.el
	files/.zshrc
update for OSX