Style tweaks.
Merge branch 'chronicled' of github.com:substance/composer into chronicled