Changes to .osx and .cask
Merge branch 'master' of https://github.com/cubicray/dotfiles