Update to 2013 keithw coding conventions