Finished migrator.

Also fixed some Flexidata bugs.
Merge remote-tracking branch 'origin/master'