Latest from b4winckler merged into split-browser

This is a merge with conflicts resolved for the latest and greatest from b4winckler's macvim.