Merge pull request #9 from gonsfx/file-support

Grunt file support
Bump version
Merge remote-tracking branch 'upstream/master' into file-support

Conflicts:
	package.json