The memory leaks should be taken care of.
Merge branch 'master' of https://github.com/scottsievert/iSensing

Conflicts:
	.DS_Store