lmftfy
Merge upstream's parallel construction paragraph

Conflicts:
	_posts/2013-12-10-nsa-an-inside-view.md