lots of tim's additions
Merge branch 'master' of https://github.com/matthensley1/eclipse_odp
Merge branch 'master' of https://github.com/matthensley1/eclipse_odp