Espruino 1v88 released

Okay I figured out my own problem :)
on line 2080 of makefile

	@echo FIXME - had to set --overlap=replace
	python scripts/hexmerge.py --overlap=replace $(SOFTDEVICE) $(NRF_BOOTLOADER) $(PROJ_NAME).hex -o tmp.hex

and line 2086 of makefile

	python scripts/hexmerge.py $(SOFTDEVICE) $(PROJ_NAME).hex -o tmp.hex

I had to add the "python" preface which was missing before the call to hexmerge.py - this fixed the merging problem.

Also to fix the vagrant setup problems I changed the provision.sh by adding the top three lines and commenting out the lower ones.

sudo add-apt-repository ppa:team-gcc-arm-embedded/ppa
sudo apt-get update
sudo apt-get install gcc-arm-embedded
 
# download known working version of arm-none-eabi-gcc
[#sudo](https://forum.espruino.com/search/?q=%23sudo) mkdir ~/gcc-temp
[#cd](https://forum.espruino.com/search/?q=%23cd) ~/gcc-temp
[#sudo](https://forum.espruino.com/search/?q=%23sudo) wget https://launchpad.net/gcc-arm-embedded/4.8/4.8-2014-q3-update/+download/gcc-arm-none-eabi-4_8-2014q3-20140805-linux.tar.bz2
[#cd](https://forum.espruino.com/search/?q=%23cd) /usr/local
[#sudo](https://forum.espruino.com/search/?q=%23sudo) tar xjf ~/gcc-temp/gcc-arm-none-eabi-4_8-2014q3-20140805-linux.tar.bz2
 
# apply setup config to add compiler to PATH
# from stackoverflow i.e http://stackoverflow.com/a/28279205

I also edited the vagrant_setup.sh to include the correct path to new version of gcc-arm-embedded

export PATH="$PATH:/usr/local/gcc-arm-embedded/bin/"

I am not sure this is all correct but when I upload hex files for the NRF52832DK they now show up as bluetooth devices and some basic commands work :)

You can see the changes on my fork of Espruino here https://github.com/espruino/Espruino/compare/master...clowrey:master