Commit cdd71711cedd3c79a10f75ea8ff98c3979bf6c6c

Edward Thomson 2014-10-13T14:34:32

Clean up some memory leaks