new fourid planet lab data collected
updated git ignore to ignore massive fourid logs for planetlab
removed data merge code from plot scripts for planetlab