Changed Makefile back to the way it was in Foundations
Corrected LoadPath commands to make them uniformly .. as Foundations
Merge branch 'vv-master-for-coq8.4pl3patched' of https://github.com/UniMath/UniMath into vv-master-for-coq8.4pl3patched