Fixes spacing for "for", "while", "switch" and "if"
Also moved && and || to ends of lines instead of start.
Fixed misc vertical alignments and some { needed newlining.
Merge pull request #155 from Parlane/codestyle_fixes

Fixes spacing for "for", "while", "switch" and "if"