More cleanup
no need to read the directory twice
Breaking away the tangling
Renaming some vars
Merge branch 'master' of https://github.com/filamentgroup/grunticon