oh-my-zsh added
Merge branch 'master' of github.com:ict/dotfiles