Simplify and clarify config file generation.

    Config file generation was convoluted and difficult to
    follow due to branching on boolean conditions.
    Restructured so that generation is straightforward, and
    so that the type of config being requested is obvious.
Merge pull request #188 from zanata/rhbz959834

Make config download maintainable
Merge commit '49b2450eb1bcf45cbe3c035913900fd3dca57cf2' into HEAD