Merge branch 'dev'
Merge branch 'dev'
improved compat
fix breaking zshrc
add brew cask
add iterm
add msoffice
add dropbox
update for osx
Merge branch 'master' into dev