Added mvim to bin
Merge and diff configs for git.