Code Review Complete DO NOT MERGE

I reviewed everything but the Javascript, since you had some good help by Josh this past week.  I talked with him and he feels your JS is in a good space.

Just some minor comments in a few files.  See the 'files changed' for my comments.