Gruntfile tweaks
More dependencies for testing
New prototype