Clean up Makefiles to match bitcoin master