vim chapter ii
Merge branch 'draft' into gavin