Replaced long lines with 80 char lines.
Merge branch 'plan' of github.com:gbonnema/xmas into plan

 the commit.