Merge branches api-current and ui-0.4, minor fixes
Merge branches api-current and ui-0.4: * Fix merge conflicts * Fix minor bug in reconciliation mgmt command * Add comments in settings.py.dist * minor PEP8 fixes
Reconciliation command documentation + config options
Use the simpler amqp_connection mechanism
Merge branch 'invitations' into reconcilation
Conflicts: logic/dispatcher_callbacks.py settings.py.dist
Skip deleted and suspended VMs from reconciliation
Lots of backfixes in status reconciliation code
Minor fix to make it connect to Rabbit
s/reconciliate/reconcile/ :-) + license headers
Various small bugs
-Print vm_ids as strings, not numbers-Filter top X VMs to update
Initial (untested) impl of the Django reconciliation command
View revisions
Also available in: Atom