Merge branch 'organization' into layout
Add configuration variables for various elements in the layout
Merge pull request #444 from jpmckinney/layout

Add configuration variables for various elements in the layout