Updates to conkry and vimrc
Change time format and add date