Added few options and cleaned up vimrc