style change while i'm here
updated user display name rules
indentation
Merge pull request #178 from goodybag/header-cleanup

Header cleanup
Merge branch 'master' into 177-header-redesign