Merge pull request #33 from jbwhite/joseph

Joseph
added @user definiton to layout view to stop throwing errors for undefined user