Merge branch 'master' of github.com:jonlong/mackup into alternate_folder

Conflicts:
	.mackup.cfg
	CHANGELOG.md
	mackup.py