Import sacha's org-mode improvements

Ask for effort estimate when clocking in.
Log and clock into LOGBOOK drawer.
Add rich task under special key "s".