Compliance with grunt 0.4.x, merged and revised some pull requests, and fixes