More formatting corrections.
Merge branch 'master' of github.com:playframework/playframework