Merge pull request #223 from invisiblek/cm-10.1

jfltexx: fix naming derp
Merge pull request #224 from invisiblek/cm-10.1

jf: remove macloader, we'll build it instead
d2: let's build macloader instead

Change-Id: I3a3d81f1050bb2e26963cdc2f73f347be98fb95d