Add a weak "current" phase for tasks
Fix a date sorting bug
Clean up the flag (done / now / later) code
Merge branch 'feature/30' into feature/14