Remove some extra whitespace.
Update includes for Arduino 1.0.