Minor style fixes
Readme now mentions running the example client
Merge remote-tracking branch 'upstream/master'