Code Review

Do not merge this. 

This branch is for comments, only.
When writing erb files, adhere to the "one tag per line" rule. Also, follow the same indentation rules that you would for writing Ruby code.