Adding support for Scrivener
Merge branch 'scrivener' of github.com:iloveitaly/mackup into iloveitaly-scrivener

Conflicts:
	CHANGELOG.md
	README.md