Update documentation to reflect new name of styleview priv.
Merge pull request #482 from kareila/bug5144-privlist_hook

Bug 5144 - Update documentation to reflect new name of styleview priv.
Fix input argument sanitization

The s2id argument wasn't properly sanitized, so if you passed text in,
later codepaths would complain about non-numeric inputs. This ensures
that s2id is numeric before we use it.
(bug 5180) Fix warning in merge view
Merge pull request #490 from anall/feature/bug5180

(bug 5180) Fix warning in merge view