Cleanup

Deleted the old jsocks code
Cleaned some deployment stuff out of the pom
Changed tabs to two spaces
Added @Override annotations