Merge pull request #314 from knowledgepoint-devs/merge1

Widget fixes and corrections/improvements to instructions for setting up new sites
Merge remote-tracking branch 'upstream/merge1' into merge1