Fixing imports from other dirs
More changes to imports
Merge branch 'dump-job' of https://github.com/dzeber/fxos-metrics into dump-job

Conflicts:
	processing/generate_dump_csv.py