Oh for fuck's sake, Digg.com doesn't actually support HTTPS. :P
Merge branch 'master' into tumblr

Conflicts:
	web/index.html