Merge branch 'master' of git@github.com:pbeckingham/task into 1.4.0

Conflicts:

	ideas.txt

ideas.txt

@@ -6,11 +6,14 @@ Real Parsing
     - task done <ID> [<ID> ...]
 
 User-Defined Reports
-  report.xxx=id,project(2+),priority(1-),description
-  change all list-based reports to user-defined
+  report.large=id,uuid,project,priority,entry,start,due,active,tags,description
+  report.long=id,project,priority,entry,start,due,tags,description
+  report.list=id,project,priority,due,active,description
+  report.ls=id,project,priority,description
 
-Generalized Report Writer
-  provide column list, sort order, filter
+  Sorting is always: due+ priority- project+
+
+  ID UUID Project Priority Entry Start Due Active Tags Description
 
 Test Suite
   allow .taskrc override
@@ -64,4 +67,3 @@ Recurrence
       5 Friday 7/13/2008                 (not shown)
       6 Friday 7/20/2008                 (not shown)
       7 Friday 7/27/2008                 (not shown)
-