fixed l alias
finished merging vimrc
renamed elliots pubkey