Merge pull request #32 from Tetha/tetha-cleanup

Fixed a number of resource leaks and eclipse warnings
Fix launcher always wanting to update