now compiles
Merge branch 'master' of https://github.com/pumped/dispm

Conflicts:
	migclim/migclim.c
Merge branch 'master' of https://github.com/pumped/dispm

Conflicts:
	api/main.py
Loading initial hs matrix on startup
Writing input files and migc to run directory