penta: update conf (mostly merging back from vimp)
penta: update conf (mostly merging back from vimp)

scorpiovn/dotfiles,scorpiovn/dotfiles,blueyed/dotfiles,scorpiovn/dotfiles,scorpiovn/dotfiles,blueyed/dotfiles,blueyed/dotfiles,blueyed/dotfiles,scorpiovn/dotfiles,blueyed/dotfiles