Submit/cups update

This pull request consists of two patches:
1) gutenprint CVS (could be useful some time)
2) The more important patch introduces a second "cups-1.6.nix" module and nixpkgs  changes which allow to print with cups-1.6 and  1.7. Have a look at the commit's description for details