Merge pull request #1 from craigspaeth/master

working
Merge pull request #2 from craigspaeth/master

Added tests
add cli
add comment
support jpeg and xml
fix build
Merge pull request #5 from zamiang/jpeg

@craigspaeth Support jpeg and xml
add cache control headers
remove stray console log
Merge pull request #6 from zamiang/cache

@craigspaeth Add cache control headers (same as the ones we use at artsy.net)
fix tests bump version
add gz
support cgz for safair 4
bump version
Merge pull request #7 from zamiang/cgz

@craigspaeth Support cgz for Safari 4
changes test assertion from include to containsEql
a test to show that folders with files get uploaded as well
Merge pull request #9 from broskoski/upload-folder

test to show that bucket-assets handles folders as well as files
stash
Merge branch 'master' of github.com:artsy/bucket-assets

Conflicts:
	package.json