Some style tweaks from RequireJS updates
Whitespace and bracket formatting
Merge branch 'requirejs-style'