more makefile moving, so that we don't recompile every time...
Merge branch 'master' of github.com:BenedictEggers/coelacanth