revise conference post
Merge branch 'master' into staging

Conflicts:
	databrary/input/posts/2014-07-17_ISIS_conference_winners.md