Address clang always true warnings
Merge pull request #69 from andrewgaul/always-true

Address clang always true warnings