wip
Merge branch 'master' into hofs

Conflicts:
	slides/index.html

	new file:   assets/promises.ai
	modified:   index.html
	new file:   js/d3.js
	modified:   slides-theme/style.css
	new file:   slides-theme/talk-specific.css
	deleted:    style.css