Add --conf option to change the default config file name
Document --conf option
Add option crossreferences
Merge branch 'master' of github.com:mher/flower