update gitignore; add fancy password and git completion scripts
solve merge conflict