Massive cleanup of Makefiles! Closes #8