Cleaned Makefile

Removed unused targets, old comments, PHONY declarations
Merge branch 'master' into inversion