Change Mac guifont to DejaVu Sans Mono
Merge remote-tracking branch 'origin/master'