changed makefile rules and gnuplot scripts, new aux directory
conflicts in plots resolved