update

Signed-off-by: Matt Shields <matt@mattshields.org>
Merge branch 'master' of https://github.com/mattboston/s3pushpull

Signed-off-by: Matt Shields <matt@mattshields.org>

Conflicts:
	README.md
update

Signed-off-by: Matt Shields <matt@mattshields.org>