updated grunt to latest, improved task structure in Gruntfile