Replace newlines with spaces for readability
Set the config filename to None in tests
Merge branch 'master' of github.com:mineo/lala

Conflicts:
	lala/plugins/fortune.py