New build to test state change in. Also various Gruntfile fixes that arose from the tasks split.