Changed colourdiff to always use unified diff format
Removed diff_args from puppet.conf as it is no longer needed