0.9.3 grunt cleanup

I figured it'd be good to just go ahead and open a pull request so you can see my in progress changes and we can discuss them.