rm unused grunt line
Update CHANGELOG.md
release 0.6.4
Update CHANGELOG.md
Merge branch 'master' into unit-tests