More tweaks from awesome vimrc