Merge remote-tracking branch 'origin/alternate_folder'

Conflicts:
	.mackup.cfg
	CHANGELOG.md
	mackup.py
Merge branch 'master' of github.com:jonlong/mackup

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