Update package.json to be more verbose
Bump gulp version in package.json
Move i.scss -> app.scss
Merge branch 'master' of github.com:mrmrs/trim

* 'master' of github.com:mrmrs/trim:
  Testing updates with prose.io
  Updates node modules and subsequent reference in package.json.

Conflicts:
	package.json