Merge branch 'master' into multiple-hosts

Conflicts:
	capsulflask/console.py
	capsulflask/db.py
	capsulflask/shared.py
	capsulflask/virt_model.py

capsulflask/schema_migrations/13_down_introduce_hosts.sql

@@ -0,0 +1,11 @@
+
+DROP TABLE host_operation;
+
+DROP TABLE operations;
+
+ALTER TABLE vms DROP COLUMN host;
+
+DROP TABLE hosts;
+
+
+UPDATE schemaversion SET version = 12;