Support for Punto Switcher
Merge branch 'punto-switcher' of https://github.com/bashu/mackup into bashu-punto-switcher

Conflicts:
	CHANGELOG.md
Merge branch 'bashu-punto-switcher'