added twitter / lanyrd + 500
Merge branch 'master' into gh-pages