Commit 8f76d15fae3c3107747691838deb20d4c2ff0696

Con Kolivas 2012-06-13T17:16:27

Merge pull request #223 from luke-jr/bugfix_warnings Fix a bunch of warnings