Big update of grunt and overall cleaning up.