Add Ncmpcpp config
Add alias git status, overwrite gst
Use vimdiff for git merge/diff
Remove trailing whitespaces