More grunt 0.4.0 and travis fixes