added automake system
adjusted .gitignore
Merge branch 'master' into cleanup