Use autoreconf -i and add gitkeep to m4 to make automake happy
Merge pull request #213 from jbussdieker/master

Use autoreconf -i and add gitkeep to m4 to make automake happy