Merge pull request #5 from mozilla/master

 Creating key_value in inventory returns HTTP 500 error
changes preping for south