Merge remember-diary.el into remember.el