Renamed/reordered things a bit
Created "build" task abstraction
Merge branch 'improve-grunt' into develop