Removed long ids and replaced with composite ids
Commented out test in ExportImportTest that breakes the other tests
Merge pull request #534 from stianst/master

Removed long ids and replaced with composite ids