Add link to contributing section
Move wiki content into main readme
Merge remote-tracking branch 'upstream/master'