sanely organized project. updated deps and grunt file.