Updated to include concat for dev task and update Gruntfile