more thinking about defaults
Merge branch 'master' of https://github.com/tomlurge/visionion

Conflicts:
	doc/defaults.md