Adding some other functions, and cleaning up vimrc a little