Fixed includes when compiling pn interface

bootstrap/modelling.alc

@@ -1,6 +1,7 @@
 include "primitives.alh"
 include "io.alh"
 include "object_operations.alh"
+include "constructors.alh"
 
 String function instantiated_name(element : Element, original : String):
 	if (original == ""):

integration/utils.py

@@ -274,7 +274,7 @@ def run_barebone(parameters, expected, interface="0", timeout=False, wait=False,
                         # Modelverse has already terminated, which isn't a good sign!
                         return False
 
-                    val = urllib2.urlopen(urllib2.Request(address, urllib.urlencode({"op": "get_output", "username": username})), timeout=120).read()
+                    val = urllib2.urlopen(urllib2.Request(address, urllib.urlencode({"op": "get_output", "username": username})), timeout=120 if not timeout else 20).read()
                 except:
                     if timeout:
                         return True

interface/HUTN/includes/primitives.alh

@@ -79,7 +79,6 @@ Boolean function string_startswith(a: String, b: String)
 Element function deserialize(a: String) 
 String function log(a: String)
 Element function read_root()
-Element function exec(a : Element)
 Element function input()
 Element function output(a : Element)
 Boolean function is_physical_int(a : Element)
@@ -89,3 +88,6 @@ Boolean function is_physical_action(a : Element)
 Boolean function is_physical_boolean(a : Element)
 Boolean function has_value(a : Element)
 Element function dict_reverse(a : Element, b : Element)
+
+Element function exec(a : Element)
+Element function eval(a : Element, b : Element)