updated .zshrc
'preparing for merge'
Merge branch 'master' of https://github.com/dmoore5050/sublime_text_2_settings