Fixed rebase command and updated vim plugins