Further improved vimrc and added some niceties like a marked commandline function