Added grunt. Organized my js.
merging from remote master