Use neovim versions of ~/.vim and ~/.vimrc
Put waffle and travis badge together
README.md: cosmetic fixes