Move automake to more appropriate directory
Update automake to 1.11.6
Merge pull request #508 from pyhalov/automake

Automake