Fixing some compiler warnings
Merge branch 'master' of github.com:losalamos/CLAMR