Fix indent
Update aliases
Merge branch 'master' of github.com:timurvafin/dotfiles

* 'master' of github.com:timurvafin/dotfiles:
  Update oh-my-zsh
  Better sublime aliases

Conflicts:
	zshrc