Improve deployconfig generator diffing

Also improve the unit tests.
Merge pull request #31 from ironcladlou/generator-fixes

Improve deployconfig generator diffing