Clean up the makefile a bit

Simplifies/explains png import