Merge branch master (plugin git conflict)
add DS_Store OS X files to gitignore
Merge branch 'master' of https://github.com/alexduros/oh-my-zsh