add customisations
merge everzet/master
update colors
update vimrc