removed redundant 'that'
added meta tags for twitter cards
Merge branch 'master' into ph