Merge branch 'master' into develop

Conflicts:
	bootstrap.sh

README.md

@@ -76,6 +76,11 @@ Then, you can install pip requirements in your virtualenv:
     
 ([osx|win] depends, of course, on your platform. On other platforms, just use requirements.txt).
 
+**Temporary problem:** The author of polib, which is a dependency here,
+[hasn't yet uploaded packages to PyPI][polib], which will make the command fail if you use
+pip >= 1.5. You'll have to add `--allow-external polib --allow-unverified polib` to your command.
+This is, hopefully, a temporary situation.
+
 ## Actual building and running
 
 With your virtualenv activated, you can build and run dupeGuru with these commands:
@@ -96,3 +101,4 @@ You can also package dupeGuru into an installable package with:
 [pyqt]: http://www.riverbankcomputing.com
 [cxfreeze]: http://cx-freeze.sourceforge.net/
 [advinst]: http://www.advancedinstaller.com
+[polib]: https://bitbucket.org/izi/polib/issue/42

bootstrap.sh

@@ -16,7 +16,7 @@ fi
 
 echo "Installing pip requirements"
 if [ "$(uname)" == "Darwin" ]; then
-    pip install -r requirements-osx.txt
+    pip install -r requirements-osx.txt --allow-external polib --allow-unverified polib
 else
     python3 -c "import PyQt5" >/dev/null 2>&1 || { echo >&2 "PyQt 5.1+ required. Install it and try again. Aborting"; exit 1; }
     if [ -d "deps" ]; then
@@ -24,7 +24,7 @@ else
         # of downloading it from PyPI.
         pip install --no-index --find-links=deps -r requirements.txt
     else
-        pip install -r requirements.txt
+        pip install -r requirements.txt --allow-external polib --allow-unverified polib
     fi
 fi