Fix warnings on OSX compile
Merge pull request #42 from ethanhugg/cosmetic

Updated contributors file
Add make test to Travis
Merge pull request #43 from ethanhugg/travis1

Add make test to Travis
Merge pull request #41 from fluffy/cj1

Fix compile warnings on OSX compile
Fixed warnings found by clang.  Removed some trailing whitespace.