Merging changes for ICRA RnB paper
Cleaning up changes from droplet computer from ICRA 2013 RnB paper to make a new clean master.