added lib dependancy note.
vagrant was bitching about syntax.
The import statment ``from middleware import`` was breaking things. This command fixed stuff.
```
    find build/views.py dhcp/views.py api_v2/*_handler.py reports/views.py systems/views.py urls.py -name "*.py" -print | xargs sed -i 's/^from middleware/from mozilla_inventory.middleware/g'
```
Merge branch 'master' of github.com:uberj/mozilla_inventory
Needed to add ROOT_URLCONF for the dev server to work.
Merge branch 'master' of https://github.com/rtucker-mozilla/mozilla_inventory

Conflicts:
	settings/base.py
Added build/ to gitignore
Merge branch 'master' of github.com:uberj/mozilla_inventory
Added better permission handling to deleting unmanaged systems. Resolved Issue #86
Refactored license delete to put more logic into the model. Resolved Isue #87
Removed pdb statement. Issue #87
Initial buildout of separate authorization
removed pdb debugging statement
Per recommendation of uberj, BaseACL now inherits from object explicitely
Update to KeyValue model for __unicode__ and __repr__
Initial commit of dns stuff. Step 1: build data sctructures.
Run this command to see system information.

    python manage.py builddns
Formating and clean up of comments.
important stuff.

Conflicts:

	dns/dns_build.py
Initial implementation of grouping DNS data into sites.
fixing conflict.