Updating everything so grunt works