2nd attempt codebase 329 02-14-13
bring in oscurrency master
added change from osc #b3da5535 transact hours bug
fixed merge with github