Avrious fixes in homeshick, vimrc