cleanup makefile and misc.
Merge branch 'detect-mc-map' of https://github.com/heechul/misc into detect-mc-map