Did some cleanup and fixed tycho settings for sonar integration.