identation #22
commented out lines are deleted #22
Makefile.old: Removed already reimplemented targets
Makefile.am: Moved some cleanup rules here from the old Makefile
Makefile.am: Moved imgtest target here
Makefile.am: Removed already deleted files from here too.
Merge pull request #30 from mochrul/for_upstream

Make reorganisation