Update README
Add common stuff
Merge remote-tracking branch 'hoatle/master'