Add colorschemes folder
Remove strange duplicate vim folder
Add lg alias and conflictstyle to gitconfig