Cleanup of pentadactyl and vimrc