reverted making s and a into aliases
added options from old vimrc