align require statements per style guide

Was reading through source and figured I would line up require statements. Did initial pass through all files and commit as one PR.
cleanup comma separated var statements

This test seems to violate the style guide. Also fixed typo in ARCHITECTURE.md
fixed per stefanpenner feedback
Merge pull request #472 from eccegordo/master

align require statements per style guide