add npmaki, remove maki
Clean up gitignore and makefile
Remove files that are part of the build
use npmaki instead
Update drinking water icons