fixes for new MBA/Darwin. todo: vim bundle cleanup