Implementation of issue number #2 to remove the separate attributes used to setup the server

Hi Mike,

I've put in place an implementation of issue number #2 regarding simplifying the configuration down. The change does not preserve backwards compatibility with the existing 1.5 schema so have given it a version of 1.6.

Hopefully this will meet with your approval.

Cheers

Andy