Merge latest code and grunt automation for linting/tests/compression