Merge pull request #5 from mozilla/master

 Creating key_value in inventory returns HTTP 500 error
changes preping for south
forgot to add south to vendor.pth.

Also added random direcotry and file.
updated deploy.py to migrate during deploy runs
Merge branch 'master' into feature_dns

Conflicts:
	.gitmodules
	base/__init__.py
	base/mozdns/models.py
	vendor-local/vendor.pth