cleaned up some memory leaks. -James
Merge branch 'master' of https://github.com/Stubble/stubble