Clean up
Merge branch 'master' of https://github.com/psophis/dotfiles

* 'master' of https://github.com/psophis/dotfiles:
  Updated oh-my-zsh
  OSx Spesific aliases

Conflicts:
	oh-my-zsh
	zshrc