Merge branch 'gh-pages' of https://github.com/the-engine-room/PACT-kit into gh-pages

Conflicts:
	_posts/PACT-activities/2014-09-23-Risk-Mapping.html
	_posts/PACT-activities/2014-09-23-Risk-Mapping.md