org mode logging of time task completed, and completion notes, enabled.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Resolved differences between local copy and master.

Added org mode settings.
ido-mode ~ hook.
yasnippet settings.