Added option '--config'

This simple change enables the use of a '--config' option when starting the server.
Added tests for added '--config' option.
Merge branch 'patch-1' of git://github.com/ocfuu/mkdocs into ocfuu-patch-1
Merge branch 'master' into ocfuu-patch-1
ConfigTest cleaned up slightly