Added host specific config.
Merge branch 'master' into gondwana

Conflicts:
	functions