Style fixes across the material-sprint branch.
Should bring the build back to a pleasant green color.
Merge pull request #467 from sgomes/material-sprint-style-fixes

Style fixes across the material-sprint branch.