Fixing up comments so they look better when Facebook Comments is set
Merge branch 'comments' into develop