Most of work done updating code
Remove unneeded line
Builds but tests fail
Fixed some tests. Need to debug some more tests.
Peercoinj 0.12.2 now builds successfully