Updated docblock and wiki links
Merge pull request #426 from bradp/trunk

Updated docblock and wiki links, props @bradp