attempted merge of conflicts in PR.

# Conflicts:
#	documentation/conf.py
#	documentation/documentation.rst
#	documentation/errors Quintijn.txt
#	documentation/modules.rst

.gitignore

@@ -95,6 +95,8 @@ MacroSystem/*_vcl.py
 src/dist/
 dist
 
+# git extensions
+*.orig
 #tests
 
 

documentation/conf.py

@@ -69,6 +69,7 @@ def __getattr__(cls, name):
     'vocoladirectory',
     'unimacrodirectory',
     'unimacrogrammarsdirectory',
+    'unimacro.spokenforms',
 }
 for module_name in mock_modules:
     sys.modules[module_name] = Mock()

documentation/documentation.rst

@@ -27,7 +27,6 @@ Then run the following command on Windows to build the documentation:
    $ ./make html
 
 
-
 If there were no errors during the build process, open the
 *_build/html/index.html* file in a web browser. Make changes, rebuild the
 documentation and reload the doc page(s) in your browser as you go.