fix merge conflicts with master

wscript

@@ -34,6 +34,7 @@ children = [
         'libs/ardour',
         'libs/gtkmm2ext',
         'libs/audiographer',
+        'libs/plugins/reasonablesynth.lv2',
         'gtk2_ardour',
         'export',
         'midi_maps',
@@ -57,7 +58,7 @@ def fetch_gcc_version (CC):
     return version
 
 def fetch_git_revision ():
-    cmd = "git describe --tags HEAD"
+    cmd = "git describe HEAD"
     output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
     rev = output[0].decode('utf-8')
     return rev