[edit] 'future-friendliness' – edits after Jean by Oliver
Merge branch '2014-11-29-content-edits' of github.com:jeancflanagan/olivermakes into jeancflanagan-2014-11-29-content-edits

Conflicts:
	_posts/2014-11-06-design-notes-future-friendiness-robustness.md
Merge pull request #1 from opattison/jeancflanagan-2014-11-29-content-edits

2014-11-29 Collaborative edits PR