gitconfig merged
Merged sublime settings
Deleted unused files
Update brew & cask files
Disable most .osx settings until configured to match system