A faster, cleaner, less merge conflic grunt config