updated to latest oh-my-zsh and fixed gitignore api url
Merge branch 'master' of github.com:eripa/dotfiles

Conflicts:
	oh-my-zsh