Update imports
Merge pull request #181 from Metaswitch/imports

[No reviewer] Update imports