fix both 254 and 257
removing inadvertent files
fix grunt nits
Merge pull request #260 from davidascher/254-257

254 257