Merge branch 'master' into czr_pythons_pg

# Conflicts:
#	.gitlab-ci.yml

make.py

@@ -58,10 +58,7 @@ if __name__ == '__main__':
             readme = readfile('README.md', box, lines=True, strip=True)
 
             if '---' in readme:
-                try:
-                    readme = readme[readme.index('---')+1:]
-                except IndexError:
-                    readme = readme[:-1]
+                readme = readme[:readme.index('---')]
 
             readme = readme + ['', '---', '', 'Usage in Vagrantfile:', '```',
                                'config.vm.box = "'+PREFIX+box+'"',