Merge branch 'master' into master

diff --cc README.rst
Simple merge

diff --cc xkcdpass/xkcd_password.py
index 894e58669f8bdd9f1534863a4b2d9443fc75cff1,fe4d8a88a225479f71f1d5a646b0a05b572ae4b3..9195e2f58128bae569f6dc89095d52da0466373d
--- 1/xkcdpass/xkcd_password.py
--- 2/xkcdpass/xkcd_password.py
+++ b/xkcdpass/xkcd_password.py
@@@ -273,9 -274,10 +280,10 @@@ CASE_METHODS = {"alternating": alternat
                  "upper": upper_case,
                  "lower": lower_case,
                  "random": random_case,
 -                "first": first_upper_case,
 -                }
 +                "capitalize":capitalize_case}
 +
  
+ 
  def set_case(words, method="lower", testing=False):
      """
      Perform capitalization on some or all of the strings in `words`.