initial work for grunt integration
more changes for grunt integration
more grunt changes