Port over from code.google.com, also copy over changes from DashClock project