composition.* : style corrections.
Merge branch 'google_style' of https://github.com/rakhimov/cyclus into rakhimov-google_style
composition.cc : correct indentation of initializer list.
Merge branch 'google_style' of https://github.com/rakhimov/cyclus into rakhimov-google_style
Merge branch 'rakhimov-google_style' into develop