dont want to actually zip shit yet. just print what would have been done.
Merge branch 'master' of https://github.com/jrlusby/backup-zipper.git
bug fixes in local. going to merge with remote copy of same changes
Merge branch 'master' of https://github.com/jrlusby/backup-zipper.git

Conflicts:
	backup-zipper
finished stuff
Merge branch 'ftp_feature'

Conflicts:
	backup-zipper
Merge branch 'master' of https://github.com/jrlusby/backup-zipper

Conflicts:
	backup-trimmer.py
	backup-zipper.py
inplace changes