Commit 9e44289c8dfece4171c7f272389b14d040c72228

Edward Thomson 2014-10-26T19:58:24

Merge pull request #2612 from ethomson/warnings Clean up some warnings