um. there are some deleted files?
Merge branch 'master' of https://github.com/fabule/Clyde

Conflicts:
	software/arduino/libraries/clyde/Clyde.cpp
	software/arduino/libraries/clyde/Clyde.h
	software/arduino/libraries/clyde/ClydeAfraidOfTheDark.cpp
	software/arduino/libraries/clyde/ClydeAfraidOfTheDark.h
	software/arduino/libraries/clyde/ClydeTouchyFeely.cpp
	software/arduino/libraries/clyde/ClydeTouchyFeely.h
	software/arduino/libraries/mpr121/I2Cdev.cpp
	software/arduino/libraries/mpr121/I2Cdev.h
	software/arduino/libraries/mpr121/MPR121.cpp
	software/arduino/libraries/mpr121/MPR121.h