Fixes two errors

This push fixes two errors :
- The script was failing if you dumped a table without "id" column.
- The script wasn't doing anything if it was passed a "--all" argument.

This push also updates with latest Django 1.6.x stable dumpdata.py merge.