bio update
Merge branch 'master' of https://github.com/societyinforisk/blog

Conflicts:
	content/blog/siracon-2014-lineup.md