Updated generatePassword algorithm

Added functionality to allow user to decide what types of characters to
include when number of declared characters is less than the length of
the password