Add some vim-ruby stuff, backupdir bits
Fix merge conflicts
Fix a thing I goofed up