break files out, use grunt to build via concat
Merge branch 'grunt' into develop