Pervasive style fixes.
Bumped version.
Merge branch 'release/0.5.4' into develop