Lots of cleanup.

Working on getting a more complete grunt build