Update keys for osX - lots of 'disable for now'
Disable many el-get packages for now
Merging upstream