Commit f5b476570d2ac4d326b4c9cefee93ed29fb2ca14

John Ohl 2014-12-22T00:46:56

Fix warnings when compiling with clang 3.5