Merge branch '1.8.0'

Conflicts:
	.gitignore
	AUTHORS
	ChangeLog
	DEVELOPERS
	Makefile.am
	NEWS
	README
	configure.ac
	doc/man/task.1
	doc/man/taskrc.5
	src/T.cpp
	src/T.h
	src/TDB.cpp
	src/TDB.h
	src/command.cpp
	src/edit.cpp
	src/import.cpp
	src/parse.cpp
	src/report.cpp
	src/rules.cpp
	src/task.cpp
	src/task.h
	task_completion.sh

AUTHORS

@@ -1,7 +1,10 @@
-Principal Author:
-  Paul Beckingham
+The development of task was made possible by the significant contributions of the following people:
+  Paul Beckingham    (Principal Author)
+  Federico Hernandez (Package Maintainer & Contributing Author)
+  David J Patrick    (Designer)
+  John Florian       (Contributing Author)
 
-Contributing Authors:
+The following submitted code, packages or analysis, and deserve special thanks:
   Damian Glenny
   Andy Lester
   H. İbrahim Güngör
@@ -10,14 +13,12 @@ Contributing Authors:
   Benjamin Tegarden
   Chris Pride
   Richard Querin
-  Federico Hernandez
   T. Charles Yun
-  David J Patrick
   P.C. Shyamshankar
   Johan Friis
   Steven de Brouwer
 
-With thanks to:
+Thanks to the following, who submitted detailed bug reports and excellent suggestions:
   Eugene Kramer
   Srijith K
   Bruce Israel
@@ -34,4 +35,6 @@ With thanks to:
   Bruce Dillahunty
   Askme Too
   Mike Adonay
+  Thomas@BIC
+  Ian Mortimer