Update ohmyzsh
Remove oh-my-zsh
Add antigen to manager zsh
Merge remote-tracking branch 'origin/master'

* origin/master:
  Add SLIM highlighting
  Update ohmy zsh

Conflicts:
	.gitignore
	.gitmodules
	.oh-my-zsh