Merge pull request #39 from mpath/vif_id_on_device

Removed cruft, flake8 passing
Fixes list ordering assertion failures
Merge pull request #40 from mpath/master

Fixes RM#3281
Check database version before migrating
Merge pull request #41 from mpath/vif_id_on_device

Fixes list ordering assertion failures
Merge pull request #42 from mpath/migration_version

Check database version before migrating
Merge pull request #22 from roaet/master

merging masters