Merge remote-tracking branch 's-o-b/contributing-github'
authorW. Trevor King <wking@tremily.us>
Sat, 8 Dec 2012 15:52:37 +0000 (10:52 -0500)
committerW. Trevor King <wking@tremily.us>
Sat, 8 Dec 2012 15:52:37 +0000 (10:52 -0500)

Trivial merge