Tweak Grunt tasks
Move tasks outside of Gruntfile