Support for Max.app
Merge branch 'max' of https://github.com/bashu/mackup into bashu-max

Conflicts:
	CHANGELOG.md
Merge branch 'bashu-max't push origin master