allow encryption_key to be set via config.yaml
Merge branch 'develop' into encryption-key

Conflicts:
	config.yaml
align whitespace
Merge pull request #326 from fooman/encryption-key

Encryption key