Merge remote-tracking branch 'upstream/gh-pages' into contributor-updates
Fixed David's github username and added Bertie to contrib list.
Merge pull request #23 from rhyolight/contributor-updates

Contributor updates