Correctly show config file locations when using a custom one
Merge branch 'master' of github.com:mirage/mirage

Conflicts:
	CHANGES
Merge pull request #314 from avsm/master

Correctly show config file locations when using a custom one