Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Allow --content_type=  on puts, for things with no mime-type suffix
Merge pull request #81 from ecweaver/master

Allow --content_type= on put requests