Merge asset and static directories, clean up gitkeeps, and update the Gruntfile to accomodate these changes.
Merge asset and static directories.