Update Makefile to current master - to facilitate an easier merge later
Update Makefile to current master - to facilitate an easier merge later

wilberforce/Espruino,wilberforce/Espruino,luetgendorf/Espruino,lancernet/Espruino,luetgendorf/Espruino,luetgendorf/Espruino,lancernet/Espruino,wilberforce/Espruino,luetgendorf/Espruino,wilberforce/Espruino,lancernet/Espruino,luetgendorf/Espruino,lancernet/Espruino,luetgendorf/Espruino,lancernet/Espruino,wilberforce/Espruino,wilberforce/Espruino,wilberforce/Espruino,luetgendorf/Espruino,lancernet/Espruino,lancernet/Espruino