Bunch of vim config stuff and copying over ncmpcpp config
Merge remote-tracking branch 'origin/master'

Merge with -s ours to ignore changes from this merge