time-machine support backup and restore
Merge branch 'master' of github.com:dirtysalt/sperm

Conflicts:
	utils/time-machine