Fixed warnings found by clang.  Removed some trailing whitespace.
Merge remote-tracking branch 'upstream/master' into cosmetic
Fix warning and turn on -Werror for Travis
Move -Werror to platform file.  Also, %zu can't be used on Windows.
Use %llu instead to print a size_t.
Cast pointer math to long long int
Merge pull request #59 from ethanhugg/cosmetic

Fixed warnings found by clang.  Removed some trailing whitespace.