Customized the layout.

I didn't actually edit every single line, but Brackets got rid of some trailing spaces.
Inconvenient for diff, but hey.
Merge remote-tracking branch 'origin/master'