Updating title tag to output page title and company name.
Update to refactor code a bit to make it cleaner.
Merge pull request #474 from weerd/title-tag-updates

Title tag updates