Documentation and transformation updates.
Update conf documentation.
Update README.md.
Merge branch 'master' into development