mach-msm: Makefile: remove intelli plug as its moved to its own dir
fix conflicts