add support for composer
Merge branch 'composer' of github.com:fayland/mackup into fayland-composer

Conflicts:
	CHANGELOG.md
Merge branch 'fayland-composer'