Merge pull request #25 from mbolivar/arduino-101-conf

arm fixes from x86 changes