Simplify Makefile

Developing inside a vagrant vm now to get a working valgrind.
Lots of changes, getting results now, but wrong