Brings mer branch closer to what is in mer gitweb

Your mer branch has one commit that is not in gitweb: 345dd7f

My compiler flags commit has not yet been accepted in mer.