First pass of cleanup.

Other issues in github issues
Merge branch 'first-pass-cleanup'
FIx Gruntfile.js