prep for rc7
use grunt@0.4.0rc7
Resolve conflicts
Fix tests to what their meant to be