Update mpdlist
Merge remote-tracking branch 'origin/master'
Old YCM config, .gitconfig, Ablaze

- Updated .gitconfig mergetool settings
- Small updates to ablaze upload script
- Added an old YCM config file I found for vim