Some more mappings and tidying of vimrc