Squashed Clock updates

Only changes for Clock were added in from the commits below

Optimize: this time CircleBattery and Clock
http://goo.gl/1bHJ5R

Frameworks: Clean up some possible memory leaks
http://goo.gl/QfApZF

Frameworks: add reset option to clock color and cleanup (2/2)
http://goo.gl/GnCvf1