updated the grunt file to handle deployment better, some minor issues, and updated package json