C-x k always kill current buffer
Add keybinding to delete current file
More tweaks to keybindings