Commit ea8ce3d17edbc16f8bc905fcee776629c2010eec

Ben Straub 2013-11-04T15:50:33

Fix warnings