Added grunt
fix what looks like nasty leftovers from coffee conversion
linting tweaks