Added config key num_words

Added the config key to specify the number of words to use when
generating the password.
Merge branch 'master' of https://github.com/bbusschots/xkpasswd.pm

Conflicts:
	XKPasswd.pm