Fix deprecated warnings about std::unary_function & std::binary_function
Initially I wanted to fix more warnings, but decided to settle for these very noisy ones for this MR.
Related to #19