vimrc clean up & add some aliases