updated dotemacs
Merge branch 'master' of github.com:xRuins/dotfiles
update oh-my-zsh