update to use path class
Merge branch 'master' of github.com:CenterForOpenScience/waterbutler-s3

Conflicts:
	waterbutler/s3/provider.py
fix broken test