fix some conventions with Gruntfile
wip main site
Merge remote-tracking branch 'origin/iss15_grunt_build'

Conflicts:
	Gruntfile.js
Merge branch 'master' of github.com:ymichael/puton