Fixed coffee arch size definitions to allow for use of reset counter
Merge branch 'driver-tweaks' into z1-sampler-fixes
added node reset script
inow does correct mac init foo
Merge branch 'mountain-sensing' into z1-sampler-fixes

Conflicts:
	mountainsensing/rpl-border-router-improved/border-router.c
Z1-Sampler partially working with CC1120
Merge remote-tracking branch 'origin/z1-sampler-fixes' into HEAD

Conflicts:
	mountainsensing/rpl-border-router-improved/border-router.c
Fixed bug with POSTing and added config defines
Merge branch 'z1-sampler-improved' into mountain-sensing
Merge branch 'mountain-sensing' of https://github.com/feshie/contiki into mountain-sensing

Conflicts:
	mountainsensing/rpl-border-router-improved/border-router.c
Added AVR stub for sampling - needs implementing
Fixed config page defaults
Added config scripts and added MAX_POST_SIZE define
Will now get messages and check CRCs, rejecting if not valid
reduced timeout for between bytes to 5ms
Now doesn't print ms1 io debug
Now passes data back to process but process doesn't do anything with it
various warnings fixed
Now gets the data back to the calling process
Now gets the data from the device and prints it