updated to use oracle jre 1.6
ready for review
PEP8 style comments
addresses review feedback
resolved conflicts