Fix warnings when compiling with clang 3.5
Merge pull request #197 from JohnOhl/fix-clang-compile-warnings

Fix warnings when compiling with clang 3.5