Makefiles?

Makefiles wouldn't work on the new Pi, had to make some changes. Also
Merricks stuff is now in its own file called 'detectObjects' in base.