[gitignore] Removing makefile from gitignore.  (why did I do that?)
[Makefile] Temporarily removing makefile
[Makefile] Moving new makefile back in.  TODO find better build system