Add ability to replace factoids with input values
Merge branch 'add-replacement-factoids'