Fix duplicate folder, adopt Gary Bernhardt's vimrc