Added Macvim and merged with original branch