Makefile fixed; analysis moved to statanalysis (and added to makefile)