Adding Kaleidoscope.app support
Merge branch 'kaleidoscope' of github.com:iloveitaly/mackup into iloveitaly-kaleidoscope

Conflicts:
	CHANGELOG.md
Merge branch 'iloveitaly-kaleidoscope'