Fixed makefile, remove unused builder.js

Fixed a typo in the makefile, remove not used anymore builder.js
Merge branch 'fix-makefile'