Merge pull request #41 from infirit/master

Add dist-hook for ChangeLog and remove caja dir
Remove distro folder.
Merge pull request #44 from flexiondotorg/master

Remove distro folder.
Add  to ACLOCAL_AMFLAGS for user added flags