Tweaks to enable running grunt on travis