Fix merge issues;

Partially address #602, SDK1.4 is usable now;

libs/network/esp8266/jswrap_esp8266.c

@@ -851,8 +851,6 @@ static void scanCB(void *arg, STATUS status) {
 	struct bss_info *bssInfo;
 
 	bssInfo = (struct bss_info *)arg;
-	// skip the first in the chain … it is invalid
-	//bssInfo = STAILQ_NEXT(bssInfo, next); // this got fixed in SDK 1.4
 	while(bssInfo != NULL) {
 		// Add a new object to the JS array that will be passed as a parameter to
 		// the callback.  The ESP8266 bssInfo structure contains the following:

libs/network/esp8266/network_esp8266.c

@@ -35,7 +35,7 @@
  * SOCKET_CREATED_INBOUND - The socket was created by an in-bound.
  */
 // ESP8266 specific includes
-#define ESPSDK_1_3_0
+#undef ESPSDK_1_3_0
 #include <c_types.h>
 #include <user_interface.h>
 #include <mem.h>

targets/esp8266/jshardware.c

@@ -490,6 +490,8 @@ void jshUSARTKick(
 }
 
 
+//===== SPI =====
+
 /**
  * \brief Unknown
  *
@@ -501,11 +503,6 @@ void jshSPISetup(
 	os_printf("ESP8266: jshSPISetup: device=%d, inf=0x%x\n", device, (int)inf);
 }
 
-//===== SPI =====
-
-void jshSPISetup(IOEventFlags device, JshSPIInfo *inf) {
-} // End of jshSPISetup
-
 /** Send data through the given SPI device (if data>=0), and return the result
  * of the previous send (or -1). If data<0, no data is sent and the function
  * waits for data to be returned */

targets/esp8266/user_main.c

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /*
  * This file is part of Espruino/ESP8266, a JavaScript interpreter for ESP8266
  *