Make more consistent use of architecture #defines.
For information on installing libraries, see: http://arduino.cc/en/Guide/Libraries