Further updates
Merge branch 'master' of https://github.com/jmeas/grunt-bundler

Conflicts:
	tasks/resourceful.js
	test/fixtures/data/array_only_files.json
	tmp/index.html