Fixing imports

Created by: mattclarke

I had to do this to get the system tests to run from the command line. Were other people able to run them before?

I'm using relative imports, so sorry if that makes you barf!