Merge asset and static directories, among other things

- Clean up gitkeeps
- Update the Gruntfile to accomodate these changes.