New vim mappings + TBookmark improvements