Moderate Update

* Minor cleanup
* Shifted to Grunt build system