Merge branch 'master' of github.com:pekepeke/dotfiles
update $EDITOR