Cleaning up, tweaking grunt setup
Still cleaning...