Added Cask, removed old OSX configuration, cleaned up the code