Removed all property default values of "null", since that is the default value by default
Collapsed all simple @var doc comments into a single line
Added additionalFields() and tableAlias() to merge reporting.

This makes sure that if you have additionalTables(), and they have
fields with the same name as tableName(), then the fields from
additionalTables() will not overwrite fields from tableName().

Updated all contacts mergers who needed it so that they use
additionalFields() to specify what to put in the SELECT clause.
Merge branch 'sprint8/dedupe/bugfixes' into sprint8/completed

Conflicts:
	contacts/ContactsModel.php
Fixed accidental double-newline in exception pretty printer
Merge branch 'blarg'
Formatting and refactoring