Minor Gruntfile tweaking: adjust targets, reorder files slightly