Added some more content, allowed for Twitter and changed image links.
Merge branch 'master' into gh-pages