Changed to use node-glob instead of grunt expandFiles
Merge remote-tracking branch 'doug/grunt0.3' into grunt03

Conflicts:
	package.json
Fixing merge conflict with package.json
ticking version