Merge pull request #265 from bnmnetp/format2014

reformatting begins
Merge remote-tracking branch 'upstream/format2014' into format2014