cleaned up layout structure
Merge branch 'master' into issue-29-login-redirect-same
Don't include the login markup if you're logged in