Fixed formatting + jshint.
Bumped gulp util to 2.2.0. Tests updated.