Added includes, fixed grunt watch