Major Changes

Major changes in just about everything
Merge branch 'master' of https://github.com/sam-adam/Macsauto