removed leftover file from merge
added a few options to the Makefile