- Converted all (appropriate) uses of 'task' to 'taskwarrior'.
- Added tests for class Taskmod - Added tests for _merge command