fixes slight bug with twitter images
Merge branch 'master' into slideshow-twitter-display-url

Conflicts:
	slideshow/js/script.js
Merge pull request #17 from storify/slideshow-twitter-display-url

fixes slight bug with twitter images