license header
formatting, consistency, style(9) and shit
License section for the readme
Merge remote-tracking branch 'upstream/master'