Add R16 and vim headers, and normalize rebar.confs