Several more minor bugfixes
Merge branch 'Development' of github.com:emmamei/cdkey into Development

* 'Development' of github.com:emmamei/cdkey:
  One more part of autoconf to remove
  Remove automake and autoconf support
  New macros and few code changes