V1

Fixes and change to grunt task name, ordering should now work correctly