Minor changes
- Updated to JDK 7
- Cleanup
Signed-off-by:thehutch <th3hutch@yahoo.co.uk>