Added possibility to set configuration's file name on command line via --conf=xxx.
Added quotes.
Moved entry in CHANGES.txt to the top.
Improved deletion from list.
Merge pull request #1503 from felixfontein/config_file_name

Allowing to set configuration file's name on command line
Merge branch 'master' of https://github.com/getnikola/nikola

Conflicts:
	nikola/__main__.py