change @inbook to @incollection for Ritland 2011
Merge branch 'cf'