fixed environment check in arduino script
new and improved rpi setup script
fix merge conflics