Fixing issue #926 -- stringy fixes. Mostly branding issues.
Merge pull request #927 from sethmanheim/working

Fixing issue #926 -- stringy fixes. Mostly branding issues.