fix up a number of deprecated/conversion/shadow warnings
Fixed up bad merge
Merge pull request #553 from dmaclach/master

fix up a number of deprecated/conversion/shadow warnings