Minor style fix (BAD CPW!). Adding sourcejars to building. Proper cleanup.
Updated version to 1.8