Updates iterm and tmux settings
Updates oh-my-zsh, vimrc, and ctags
Merge branch 'master' into osx