fix various compiler warnings
Merge branch 'master' of https://github.com/OpenCPN/OpenCPN
Merge remote-tracking branch 'upstream/master'
Merge pull request #134 from seandepagnier/master

a few small changes to fix compiler warnings