Minor updates
Merge pull request #11 from cdeil/minor_fixes

Updates to config files and ordering within initializer lists.