remove damian conways vimrc and add to mine