Fix errors that prevented password from installing.
Merge branch 'master' of github.com:KenKundert/password