Update some settings
Merge branch 'master' of https://github.com/tan-yuki/convert-aster

Conflicts:
	Gruntfile.js