Don't use deprecated function.
Fix signed/unsigned warnings.
Switch from google-test to google-mock.
Merge branch 'master' into super_duper

Conflicts:
	cpp/util/json_wrapper.h