Update automation files
Freaky-ness
Gruntfile merge fail