WIP: Code review 2-23-14 - DO NOT MERGE

I'm using this branch/pull request to go through our code base and add comments.