Simplify grunt file and update .gitignore