use .html vs innerhtml
Merge branch 'develop'
Merge branch 'develop'
removing iconv as a required package
Merge pull request #83 from brifordwylie/iconv-remove

removing iconv as a required package
tweak for user generation on localhost