Config updates.
Merge branch 'master' of github.com:dohnto/grans-bare

Conflicts:
	config/task1/1a