collapse es and ee variables into color vars
fix Makefile to exclude vim swap files in src dir