Fix small formatting issues.
Merge branch 'master' of github-francishoguecom:francishogue/starter