Update gruntfile
Small bug fixes and improvements