Add entries missing in rockspec.
Command-line flags that were explicitly passed by the user should take precedence over config file defaults.
Don't call function when missing. Tweak needed for ldoc to build its own documentation files.
Merge pull request #136 from hishamhm/master

Give command-line flags priority over the config file (plus minor fixes)