Remove some more warnings
Merge pull request #14 from areese/cleanup_warnings

Remove some more warnings