Updated makefile, fixed parsing

I updated the Makefile to be more easily customizable with variables.  I fixed the parsing so that it can handle an input file.  I redefined fluent_list so that it's actually a list, not just a single item.