More things
Merge branch 'master' of https://github.com/davemcmurray/nib-style-guide