Updated git ignore to disregard .o files

Also tweaked makefile