Merge branch 'master' of github.com:stevenfrog/dotconfig

Conflicts:
	backup.py
Merge branch 'master' of github.com:stevenfrog/dotconfig