massive grunt update
Sweet, fixed tests